Skip to content

Commit

Permalink
Ignore ErrLayerUnknown error when attempting to cleanup container
Browse files Browse the repository at this point in the history
Fixes: containers#11207

[NO TESTS NEEDED] Since I don't know how to get into this situation.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
  • Loading branch information
rhatdan committed Sep 16, 2021
1 parent 9119a57 commit 34f719f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions libpod/runtime_cstorage.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.Errorf("error 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.Errorf("error unmounting container %q attempting to delete: %v", idOrName, err)
}

if err := r.store.DeleteContainer(ctr.ID); err != nil {
Expand Down

0 comments on commit 34f719f

Please sign in to comment.