From cfa2591d3f2636221e5005b3609aeb572e0c6653 Mon Sep 17 00:00:00 2001 From: Jacob Wen Date: Mon, 22 May 2017 15:15:04 +0800 Subject: [PATCH] Don't warn if the shm or mquere is not mounted Fix #33328 Signed-off-by: Jacob Wen --- container/container_unix.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/container/container_unix.go b/container/container_unix.go index b0a32e6d5b..b46e100bb1 100644 --- a/container/container_unix.go +++ b/container/container_unix.go @@ -13,6 +13,7 @@ import ( containertypes "github.com/docker/docker/api/types/container" mounttypes "github.com/docker/docker/api/types/mount" "github.com/docker/docker/pkg/chrootarchive" + "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/symlink" "github.com/docker/docker/pkg/system" @@ -220,7 +221,9 @@ func (container *Container) UnmountIpcMounts(unmount func(pth string) error) { warnings = append(warnings, err.Error()) } else if shmPath != "" { if err := unmount(shmPath); err != nil && !os.IsNotExist(err) { - warnings = append(warnings, fmt.Sprintf("failed to umount %s: %v", shmPath, err)) + if mounted, mErr := mount.Mounted(shmPath); mounted || mErr != nil { + warnings = append(warnings, fmt.Sprintf("failed to umount %s: %v", shmPath, err)) + } } }