Log error from unmountVolumes on cleanup

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a20fea1823ccfb40d235607e8f7ce7ceff1b5afe
Component: engine
This commit is contained in:
Alexander Morozov
2015-11-02 14:11:42 -08:00
parent f62844e779
commit 74bc9966e0
3 changed files with 7 additions and 4 deletions
+3 -1
View File
@@ -349,7 +349,9 @@ func (container *Container) cleanup() {
container.daemon.unregisterExecCommand(eConfig)
}
container.unmountVolumes(false)
if err := container.unmountVolumes(false); err != nil {
logrus.Warnf("%s cleanup: Failed to umount volumes: %v", container.ID, err)
}
}
// killSig sends the container the given signal. This wrapper for the
+2 -2
View File
@@ -6,6 +6,6 @@ import "syscall"
// Unmount is a platform-specific helper function to call
// the unmount syscall.
func Unmount(dest string) {
syscall.Unmount(dest, 0)
func Unmount(dest string) error {
return syscall.Unmount(dest, 0)
}
@@ -2,5 +2,6 @@ package system
// Unmount is a platform-specific helper function to call
// the unmount syscall. Not supported on Windows
func Unmount(dest string) {
func Unmount(dest string) error {
return nil
}