From 11d695a2973d67906145e7f0972b6e693bdaa3f9 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Wed, 16 Oct 2013 20:45:59 +0000
Subject: [PATCH] Add debug messages while testing devicemapper

---
 devmapper/deviceset_devmapper.go |  4 +++-
 devmapper/devmapper.go           |  1 +
 runtime_test.go                  |  2 ++
 utils_test.go                    | 10 ++++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/devmapper/deviceset_devmapper.go b/devmapper/deviceset_devmapper.go
index e55b3d482f..63783dcb63 100644
--- a/devmapper/deviceset_devmapper.go
+++ b/devmapper/deviceset_devmapper.go
@@ -168,6 +168,7 @@ func (devices *DeviceSetDM) saveMetadata() error {
 }
 
 func (devices *DeviceSetDM) registerDevice(id int, hash string, size uint64) (*DevInfo, error) {
+	utils.Debugf("registerDevice(%v, %v)", id, hash)
 	info := &DevInfo{
 		Hash:          hash,
 		DeviceId:      id,
@@ -188,7 +189,7 @@ func (devices *DeviceSetDM) registerDevice(id int, hash string, size uint64) (*D
 }
 
 func (devices *DeviceSetDM) activateDeviceIfNeeded(hash string) error {
-	utils.Debugf("activateDeviceIfNeeded()")
+	utils.Debugf("activateDeviceIfNeeded(%v)", hash)
 	info := devices.Devices[hash]
 	if info == nil {
 		return fmt.Errorf("Unknown device %s", hash)
@@ -560,6 +561,7 @@ func (devices *DeviceSetDM) DeactivateDevice(hash string) error {
 
 func (devices *DeviceSetDM) Shutdown() error {
 	devices.Lock()
+	utils.Debugf("[devmapper] Shutting down DeviceSet: %s", devices.root)
 	defer devices.Unlock()
 
 	if !devices.initialized {
diff --git a/devmapper/devmapper.go b/devmapper/devmapper.go
index c08e10171c..d0fb34465e 100644
--- a/devmapper/devmapper.go
+++ b/devmapper/devmapper.go
@@ -570,6 +570,7 @@ func resumeDevice(name string) error {
 }
 
 func createDevice(poolName string, deviceId int) error {
+	utils.Debugf("[devmapper] createDevice(poolName=%v, deviceId=%v)", poolName, deviceId)
 	task, err := createTask(DeviceTargetMsg, poolName)
 	if task == nil {
 		return err
diff --git a/runtime_test.go b/runtime_test.go
index 9c044538d7..49ecd3b360 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -106,6 +106,8 @@ func removeDev(name string) error {
 }
 
 func cleanupDevMapper() error {
+	utils.Debugf("[devmapper cleanup] starting")
+	defer utils.Debugf("[devmapper cleanup] done")
 	filter := "docker-" + path.Base(unitTestStoreBase)
 	utils.Debugf("Filtering out %s\n", filter)
 	// Unmount any leftover mounts from previous unit test runs
diff --git a/utils_test.go b/utils_test.go
index 013626a03a..a7afa289dc 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -30,19 +30,25 @@ type Fataler interface {
 	Fatal(args ...interface{})
 }
 
-func newTestRuntime() (*Runtime, error) {
+func newTestRuntime() (runtime *Runtime, err error) {
+	utils.Debugf("newTestRuntime start")
 	root, err := ioutil.TempDir("", "docker-test")
+	defer func() {
+		utils.Debugf("newTestRuntime: %s", root)
+	}()
 	if err != nil {
 		return nil, err
 	}
 	if err := os.Remove(root); err != nil {
 		return nil, err
 	}
+	utils.Debugf("Copying %s to %s", unitTestStoreBase, root)
 	if err := utils.CopyDirectory(unitTestStoreBase, root); err != nil {
+		utils.Debugf("ERROR: Copying %s to %s returned %s", unitTestStoreBase, root, err)
 		return nil, err
 	}
 
-	runtime, err := NewRuntimeFromDirectory(root, false)
+	runtime, err = NewRuntimeFromDirectory(root, false)
 	if err != nil {
 		return nil, err
 	}