Browse Source

Merge pull request #4895 from alexlarsson/dm-clean-shutdown

devmapper: Ensure we shut down thin pool cleanly.
Michael Crosby 11 years ago
parent
commit
755cd48258
1 changed files with 4 additions and 0 deletions
  1. 4 0
      runtime/graphdriver/devmapper/deviceset.go

+ 4 - 0
runtime/graphdriver/devmapper/deviceset.go

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