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

Merge pull request #4062 from alexlarsson/clean-shutdown

Browse source 
devmapper: Fix shutdown warnings
This commit is contained in:
Guillaume J. Charmes 2014-02-13 10:45:03 -08:00
commit 9997d0c9ed
1 changed files with 33 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

69
graphdriver/devmapper/deviceset.go
View file

@ -639,22 +639,37 @@ func (devices *DeviceSet) DeleteDevice(hash string) error {
return devices.deleteDevice(hash) return devices.deleteDevice(hash)
} }
func (devices *DeviceSet) deactivateDevice(hash string) error { func (devices *DeviceSet) deactivatePool() error {
utils.Debugf("[devmapper] deactivateDevice(%s)", hash) utils.Debugf("[devmapper] deactivatePool()")
defer utils.Debugf("[devmapper] deactivateDevice END") defer utils.Debugf("[devmapper] deactivatePool END")
var devname string devname := devices.getPoolDevName()
// FIXME: shouldn't we just register the pool into devices?
devname, err := devices.byHash(hash)
if err != nil {
return err
}
devinfo, err := getInfo(devname) devinfo, err := getInfo(devname)
if err != nil { if err != nil {
utils.Debugf("\n--->Err: %s\n", err) utils.Debugf("\n--->Err: %s\n", err)
return err return err
} }
if devinfo.Exists != 0 { if devinfo.Exists != 0 {
if err := devices.removeDeviceAndWait(devname); err != nil { return removeDevice(devname)
}
return nil
}
func (devices *DeviceSet) deactivateDevice(hash string) error {
utils.Debugf("[devmapper] deactivateDevice(%s)", hash)
defer utils.Debugf("[devmapper] deactivateDevice END")
info := devices.Devices[hash]
if info == nil {
return fmt.Errorf("Unknown device %s", hash)
}
devinfo, err := getInfo(info.Name())
if err != nil {
utils.Debugf("\n--->Err: %s\n", err)
return err
}
if devinfo.Exists != 0 {
if err := devices.removeDeviceAndWait(info.Name()); err != nil {
utils.Debugf("\n--->Err: %s\n", err) utils.Debugf("\n--->Err: %s\n", err)
return err return err
} }
@ -725,18 +740,18 @@ func (devices *DeviceSet) waitRemove(devname string) error {
// a) the device registered at <device_set_prefix>-<hash> is closed, // a) the device registered at <device_set_prefix>-<hash> is closed,
// or b) the 1 second timeout expires. // or b) the 1 second timeout expires.
func (devices *DeviceSet) waitClose(hash string) error { func (devices *DeviceSet) waitClose(hash string) error {
devname, err := devices.byHash(hash) info := devices.Devices[hash]
if err != nil { if info == nil {
return err return fmt.Errorf("Unknown device %s", hash)
} }
i := 0 i := 0
for ; i < 1000; i += 1 { for ; i < 1000; i += 1 {
devinfo, err := getInfo(devname) devinfo, err := getInfo(info.Name())
if err != nil { if err != nil {
return err return err
} }
if i%100 == 0 { if i%100 == 0 {
utils.Debugf("Waiting for unmount of %s: opencount=%d", devname, devinfo.OpenCount) utils.Debugf("Waiting for unmount of %s: opencount=%d", hash, devinfo.OpenCount)
} }
if devinfo.OpenCount == 0 { if devinfo.OpenCount == 0 {
break break
@ -744,26 +759,11 @@ func (devices *DeviceSet) waitClose(hash string) error {
time.Sleep(1 * time.Millisecond) time.Sleep(1 * time.Millisecond)
} }
if i == 1000 { if i == 1000 {
return fmt.Errorf("Timeout while waiting for device %s to close", devname) return fmt.Errorf("Timeout while waiting for device %s to close", hash)
} }
return nil return nil
} }
// byHash is a hack to allow looking up the deviceset's pool by the hash "pool".
// FIXME: it seems probably cleaner to register the pool in devices.Devices,
// but I am afraid of arcane implications deep in the devicemapper code,
// so this will do.
func (devices *DeviceSet) byHash(hash string) (devname string, err error) {
if hash == "pool" {
return devices.getPoolDevName(), nil
}
info := devices.Devices[hash]
if info == nil {
return "", fmt.Errorf("hash %s doesn't exists", hash)
}
return info.Name(), nil
}
func (devices *DeviceSet) Shutdown() error { func (devices *DeviceSet) Shutdown() error {
devices.Lock() devices.Lock()
defer devices.Unlock() defer devices.Unlock()
@ -789,11 +789,8 @@ func (devices *DeviceSet) Shutdown() error {
} }
} }
pool := devices.getPoolDevName() if err := devices.deactivatePool(); err != nil {
if devinfo, err := getInfo(pool); err == nil && devinfo.Exists != 0 { utils.Debugf("Shutdown deactivate pool , error: %s\n", err)
if err := devices.deactivateDevice("pool"); err != nil {
utils.Debugf("Shutdown deactivate %s , error: %s\n", pool, err)
}
} }
return nil return nil