opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11604 from rhatdan/deleteContainer

Browse Source 
Ignore mount errors except ErrContainerUnknown when cleaningup container
This commit is contained in:
OpenShift Merge Robot
2021-09-22 18:45:48 -04:00
committed by GitHub
parent f342784ce5 b6fecbb75e
commit 626df0a54e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/runtime_cstorage.go
View File

@ -106,18 +106,18 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error {
logrus.Infof("Storage for container %s already removed", ctr.ID) logrus.Infof("Storage for container %s already removed", ctr.ID)
return nil 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 { if timesMounted > 0 {
return errors.Wrapf(define.ErrCtrStateInvalid, "container %q is mounted and cannot be removed without using force", idOrName) 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 { } 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 // Container again gone, no error
logrus.Infof("Storage for container %s already removed", ctr.ID) logrus.Infof("Storage for container %s already removed", ctr.ID)
return nil 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 { if err := r.store.DeleteContainer(ctr.ID); err != nil {