diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-09-16 06:13:21 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-09-22 15:34:02 -0400 |
| commit | b6fecbb75ed044bd93203f81929cdc9af6441dfd (patch) | |
| tree | 11bbeae2c83f6cb48f5db1c5437c8ea5b54d8881 | |
| parent | aa628b82b1c2f04fb3a9a9207bb6d6bddb497fbb (diff) | |
| download | podman-b6fecbb75ed044bd93203f81929cdc9af6441dfd.tar.gz podman-b6fecbb75ed044bd93203f81929cdc9af6441dfd.tar.bz2 podman-b6fecbb75ed044bd93203f81929cdc9af6441dfd.zip | |
Ignore mount errors except ErrContainerUnknown when cleaningup container
Fixes: https://github.com/containers/podman/issues/11207
[NO TESTS NEEDED] Since I don't know how to get into this situation.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | libpod/runtime_cstorage.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go index cd2f226af..58bd67e6d 100644 --- a/libpod/runtime_cstorage.go +++ b/libpod/runtime_cstorage.go @@ -106,18 +106,18 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error { logrus.Infof("Storage for container %s already removed", ctr.ID) return nil } - return errors.Wrapf(err, "error looking up container %q mounts", idOrName) + logrus.Warnf("Checking if container %q is mounted, attempting to delete: %v", idOrName, err) } if timesMounted > 0 { return errors.Wrapf(define.ErrCtrStateInvalid, "container %q is mounted and cannot be removed without using force", idOrName) } } else if _, err := r.store.Unmount(ctr.ID, true); err != nil { - if errors.Cause(err) == storage.ErrContainerUnknown { + if errors.Is(err, storage.ErrContainerUnknown) { // Container again gone, no error logrus.Infof("Storage for container %s already removed", ctr.ID) return nil } - return errors.Wrapf(err, "error unmounting container %q", idOrName) + logrus.Warnf("Unmounting container %q while attempting to delete storage: %v", idOrName, err) } if err := r.store.DeleteContainer(ctr.ID); err != nil { |