瀏覽代碼

Merge pull request #17630 from LK4D4/syscall_umount_warn

Do not ignore error from syscall.Unmount
Brian Goff 9 年之前
父節點
當前提交
c9208953fa
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      daemon/container.go

+ 3 - 1
daemon/container.go

@@ -1168,7 +1168,9 @@ func (container *Container) unmountVolumes(forceSyscall bool) error {
 
 
 	for _, volumeMount := range volumeMounts {
 	for _, volumeMount := range volumeMounts {
 		if forceSyscall {
 		if forceSyscall {
-			system.Unmount(volumeMount.Destination)
+			if err := system.Unmount(volumeMount.Destination); err != nil {
+				logrus.Warnf("%s unmountVolumes: Failed to force umount %v", container.ID, err)
+			}
 		}
 		}
 
 
 		if volumeMount.Volume != nil {
 		if volumeMount.Volume != nil {