opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11787 from rhatdan/deleteContainer

Browse Source 
Storage can remove ErrNotAContainer as well
This commit is contained in:
OpenShift Merge Robot
2021-09-30 08:32:04 -04:00
committed by GitHub
parent b187dfef20 c9ea2cae1e
commit 39d27cc6cc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/runtime_cstorage.go
View File

@ -121,7 +121,7 @@ func (r *Runtime) removeStorageContainer(idOrName string, force bool) error {
} }
if err := r.store.DeleteContainer(ctr.ID); err != nil { 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 // 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

8
libpod/storage.go
View File

@ -184,8 +184,12 @@ func (r *storageService) DeleteContainer(idOrName string) error {
} }
err = r.store.DeleteContainer(container.ID) err = r.store.DeleteContainer(container.ID)
if err != nil { if err != nil {
logrus.Debugf("Failed to delete container %q: %v", container.ID, err) if errors.Cause(err) == storage.ErrNotAContainer || errors.Cause(err) == storage.ErrContainerUnknown {
return err 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 return nil
} }