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

devmapper: Move thin pool related checks in a function

Browse source 
Move thin pool related checks in a separate function. Pure code reorganization.
Makes reading code easier.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Vivek Goyal 2015-10-06 08:38:03 -04:00
parent efc1ddd7e3
commit 69051ec0a5
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
daemon/graphdriver/devmapper/deviceset.go
View file

@ -809,6 +809,22 @@ func (devices *DeviceSet) createBaseImage() error {
return nil return nil
} }
func (devices *DeviceSet) checkThinPool() error {
_, transactionID, dataUsed, _, _, _, err := devices.poolStatus()
if err != nil {
return err
}
if dataUsed != 0 {
return fmt.Errorf("Unable to take ownership of thin-pool (%s) that already has used data blocks",
devices.thinPoolDevice)
}
if transactionID != 0 {
return fmt.Errorf("Unable to take ownership of thin-pool (%s) with non-zero transaction ID",
devices.thinPoolDevice)
}
return nil
}
func (devices *DeviceSet) setupBaseImage() error { func (devices *DeviceSet) setupBaseImage() error {
oldInfo, _ := devices.lookupDeviceWithLock("") oldInfo, _ := devices.lookupDeviceWithLock("")
if oldInfo != nil && oldInfo.Initialized { if oldInfo != nil && oldInfo.Initialized {
@ -835,18 +851,9 @@ func (devices *DeviceSet) setupBaseImage() error {
} }
if devices.thinPoolDevice != "" && oldInfo == nil { if devices.thinPoolDevice != "" && oldInfo == nil {
_, transactionID, dataUsed, _, _, _, err := devices.poolStatus() if err := devices.checkThinPool(); err != nil {
if err != nil {
return err return err
} }
if dataUsed != 0 {
return fmt.Errorf("Unable to take ownership of thin-pool (%s) that already has used data blocks",
devices.thinPoolDevice)
}
if transactionID != 0 {
return fmt.Errorf("Unable to take ownership of thin-pool (%s) with non-zero transaction ID",
devices.thinPoolDevice)
}
} }
// Create new base image device // Create new base image device