diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-09-05 10:00:50 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-09-05 17:12:27 -0400 |
| commit | de9a394fcff19ae4422a3f65502c8790787351fd (patch) | |
| tree | dde244b17ac8c23a87182b82b424c50f81521090 /libpod/container_internal_linux.go | |
| parent | a760e325f3180638f9fedd0ee79d4c6695d8ba64 (diff) | |
| download | podman-de9a394fcff19ae4422a3f65502c8790787351fd.tar.gz podman-de9a394fcff19ae4422a3f65502c8790787351fd.tar.bz2 podman-de9a394fcff19ae4422a3f65502c8790787351fd.zip | |
Correctly report errors on unmounting SHM
When we fail to remove a container's SHM, that's an error, and we
need to report it as such. This may be part of our lingering
storage woes.
Also, remove MNT_DETACH. It may be another cause of the storage
removal failures.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 33c57729b..a84db9aa5 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -49,12 +49,12 @@ func (c *Container) mountSHM(shmOptions string) error { } func (c *Container) unmountSHM(mount string) error { - if err := unix.Unmount(mount, unix.MNT_DETACH); err != nil { + if err := unix.Unmount(mount, 0); err != nil { if err != syscall.EINVAL { - logrus.Warnf("container %s failed to unmount %s : %v", c.ID(), mount, err) - } else { - logrus.Debugf("container %s failed to unmount %s : %v", c.ID(), mount, err) + return errors.Wrapf(err, "error unmounting container %s SHM mount %s", c.ID(), mount) } + // If it's just an EINVAL, debug logs only + logrus.Debugf("container %s failed to unmount %s : %v", c.ID(), mount, err) } return nil } |