kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Add debug messages while testing devicemapper

Browse source
This commit is contained in:
Solomon Hykes 2013-10-16 20:45:59 +00:00
parent acf58362cb
commit 11d695a297
4 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
devmapper/deviceset_devmapper.go
View file

@ -168,6 +168,7 @@ func (devices *DeviceSetDM) saveMetadata() error {
} }
func (devices *DeviceSetDM) registerDevice(id int, hash string, size uint64) (*DevInfo, error) { func (devices *DeviceSetDM) registerDevice(id int, hash string, size uint64) (*DevInfo, error) {
utils.Debugf("registerDevice(%v, %v)", id, hash)
info := &DevInfo{ info := &DevInfo{
Hash: hash, Hash: hash,
DeviceId: id, DeviceId: id,
@ -188,7 +189,7 @@ func (devices *DeviceSetDM) registerDevice(id int, hash string, size uint64) (*D
} }
func (devices *DeviceSetDM) activateDeviceIfNeeded(hash string) error { func (devices *DeviceSetDM) activateDeviceIfNeeded(hash string) error {
utils.Debugf("activateDeviceIfNeeded()") utils.Debugf("activateDeviceIfNeeded(%v)", hash)
info := devices.Devices[hash] info := devices.Devices[hash]
if info == nil { if info == nil {
return fmt.Errorf("Unknown device %s", hash) return fmt.Errorf("Unknown device %s", hash)
@ -560,6 +561,7 @@ func (devices *DeviceSetDM) DeactivateDevice(hash string) error {
func (devices *DeviceSetDM) Shutdown() error { func (devices *DeviceSetDM) Shutdown() error {
devices.Lock() devices.Lock()
utils.Debugf("[devmapper] Shutting down DeviceSet: %s", devices.root)
defer devices.Unlock() defer devices.Unlock()
if !devices.initialized { if !devices.initialized {

1
devmapper/devmapper.go
View file

@ -570,6 +570,7 @@ func resumeDevice(name string) error {
} }
func createDevice(poolName string, deviceId int) error { func createDevice(poolName string, deviceId int) error {
utils.Debugf("[devmapper] createDevice(poolName=%v, deviceId=%v)", poolName, deviceId)
task, err := createTask(DeviceTargetMsg, poolName) task, err := createTask(DeviceTargetMsg, poolName)
if task == nil { if task == nil {
return err return err

2
runtime_test.go
View file

@ -106,6 +106,8 @@ func removeDev(name string) error {
} }
func cleanupDevMapper() error { func cleanupDevMapper() error {
utils.Debugf("[devmapper cleanup] starting")
defer utils.Debugf("[devmapper cleanup] done")
filter := "docker-" + path.Base(unitTestStoreBase) filter := "docker-" + path.Base(unitTestStoreBase)
utils.Debugf("Filtering out %s\n", filter) utils.Debugf("Filtering out %s\n", filter)
// Unmount any leftover mounts from previous unit test runs // Unmount any leftover mounts from previous unit test runs

10
utils_test.go
View file

@ -30,19 +30,25 @@ type Fataler interface {
Fatal(args ...interface{}) Fatal(args ...interface{})
} }
func newTestRuntime() (*Runtime, error) { func newTestRuntime() (runtime *Runtime, err error) {
utils.Debugf("newTestRuntime start")
root, err := ioutil.TempDir("", "docker-test") root, err := ioutil.TempDir("", "docker-test")
defer func() {
utils.Debugf("newTestRuntime: %s", root)
}()
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := os.Remove(root); err != nil { if err := os.Remove(root); err != nil {
return nil, err return nil, err
} }
utils.Debugf("Copying %s to %s", unitTestStoreBase, root)
if err := utils.CopyDirectory(unitTestStoreBase, root); err != nil { if err := utils.CopyDirectory(unitTestStoreBase, root); err != nil {
utils.Debugf("ERROR: Copying %s to %s returned %s", unitTestStoreBase, root, err)
return nil, err return nil, err
} }
runtime, err := NewRuntimeFromDirectory(root, false) runtime, err = NewRuntimeFromDirectory(root, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }