GitList

Browse code

Merge pull request #17628 from LK4D4/umount_log_err

Log error from unmountVolumes on cleanup

David Calavera authored on 2015/11/03 08:38:32
Showing 3 changed files

daemon/container.go index dc1e2f2..35daacd 100644
pkg/system/syscall_unix.go index 5005476..f1497c5 100644
pkg/system/syscall_windows.go index 3a3a55b..b3b94cb 100644

@@ -347,7 +347,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

pkg/system/syscall_unix.go

History View file @ 79d47c5

@@ -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)
+                     }

pkg/system/syscall_windows.go

History View file @ 79d47c5

@@ -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
+                     }

...	...	@@ -347,7 +347,9 @@ func (container *Container) cleanup() {
347	347	container.daemon.unregisterExecCommand(eConfig)
348	348	}
349	349
350		- container.unmountVolumes(false)
	350	+ if err := container.unmountVolumes(false); err != nil {
	351	+ logrus.Warnf("%s cleanup: Failed to umount volumes: %v", container.ID, err)
	352	+ }
351	353	}
352	354
353	355	// killSig sends the container the given signal. This wrapper for the