aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-30 08:32:04 -0400
committerGitHub <noreply@github.com>2021-09-30 08:32:04 -0400
commit39d27cc6cc065aea4ab12b646906a8ea06e30de9 (patch)
treed5f1a973dd93b0455646e5c52d7f9b6606dfcca4
parentb187dfef20df5cd853b46fe7f56d7cfae4ea0bf5 (diff)
parentc9ea2cae1e1d48931c0dc3399e1114a66635840f (diff)
downloadpodman-39d27cc6cc065aea4ab12b646906a8ea06e30de9.tar.gz
podman-39d27cc6cc065aea4ab12b646906a8ea06e30de9.tar.bz2
podman-39d27cc6cc065aea4ab12b646906a8ea06e30de9.zip
Merge pull request #11787 from rhatdan/deleteContainer
Storage can remove ErrNotAContainer as well
-rw-r--r--libpod/runtime_cstorage.go2
-rw-r--r--libpod/storage.go8
2 files changed, 7 insertions, 3 deletions
diff --git a/libpod/runtime_cstorage.go b/libpod/runtime_cstorage.go
index 58bd67e6d..5694967aa 100644
--- a/libpod/runtime_cstorage.go
+++ b/libpod/runtime_cstorage.go
@@ -121,7 +121,7 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error {
}
if err := r.store.DeleteContainer(ctr.ID); err != nil {
- if errors.Cause(err) == storage.ErrContainerUnknown {
+ if errors.Cause(err) == storage.ErrNotAContainer || errors.Cause(err) == storage.ErrContainerUnknown {
// Container again gone, no error
logrus.Infof("Storage for container %s already removed", ctr.ID)
return nil
diff --git a/libpod/storage.go b/libpod/storage.go
index ad78fe191..5c265df40 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -184,8 +184,12 @@ func (r *storageService) DeleteContainer(idOrName string) error {
}
err = r.store.DeleteContainer(container.ID)
if err != nil {
- logrus.Debugf("Failed to delete container %q: %v", container.ID, err)
- return err
+ if errors.Cause(err) == storage.ErrNotAContainer || errors.Cause(err) == storage.ErrContainerUnknown {
+ logrus.Infof("Storage for container %s already removed", container.ID)
+ } else {
+ logrus.Debugf("Failed to delete container %q: %v", container.ID, err)
+ return err
+ }
}
return nil
}