Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit c49c729

Browse files
committed
Fix "no such file or directory" warning when unmounting IPC mount
When cleaning up IPC mounts, the daemon could log a warning if the IPC mount was not found; ``` cleanup: failed to unmount IPC: umount /var/lib/docker/containers/90f408e26e205d30676655a08504dddc0d17f5713c1dd4654cf67ded7d3bbb63/mounts/shm, flags: 0x2: no such file or directory" ``` These warnings are safe to ignore, but can cause some confusion; `container.UnmountIpcMount()` already attempted to suppress these warnings, however, `mount.Unmount()` returns a `mountError`, which nests the original error, therefore detecting failed. This parch uses `errors.Cause()` to get the _underlying_ error to detect if it's a "is not exist". Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 060f387c0b03373ab837f0de039dc061133842f8) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: d17c56f639eadd47eb6ca5a0e064f5205736a9be Component: engine
1 parent a62d4a6 commit c49c729

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

components/engine/container/container_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (container *Container) UnmountIpcMount() error {
190190
if shmPath == "" {
191191
return nil
192192
}
193-
if err = mount.Unmount(shmPath); err != nil && !os.IsNotExist(err) {
193+
if err = mount.Unmount(shmPath); err != nil && !os.IsNotExist(errors.Cause(err)) {
194194
return err
195195
}
196196
return nil

0 commit comments

Comments
 (0)