devmapper: Ensure we shut down thin pool cleanly.

The change in commit a9fa1a13c3b0a654a96be01ff7ec19e8009b2094
made us only deactivate devices that were mounted. Unfortunately
this made us not deactivate the base device. Which caused
us to not be able to deactivate the pool.

This fixes that by always just deactivating the base device.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 66c5e19f9bd057644fab475499ea45bb428ba2b2
Component: engine
This commit is contained in:
Alexander Larsson
2014-03-28 15:58:14 +01:00
parent 8972e580e1
commit 8d7581c203

View File

@ -821,6 +821,10 @@ func (devices *DeviceSet) Shutdown() error {
info.lock.Unlock()
}
if err := devices.deactivateDevice(""); err != nil {
utils.Debugf("Shutdown deactivate base , error: %s\n", err)
}
if err := devices.deactivatePool(); err != nil {
utils.Debugf("Shutdown deactivate pool , error: %s\n", err)
}