aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-05-25 18:23:30 -0400
committerGitHub <noreply@github.com>2022-05-25 18:23:30 -0400
commitacdfb4d14f15814a1178985cce7175eaa13acd6a (patch)
tree6f37ed98c3ac2489c19d4dee809b62a587742fd7 /cmd/podman
parent3944d8c142c59a293069fda5254e0088662b8d7b (diff)
parent66c846616c2b77d85ec32ed730897be510b808fa (diff)
downloadpodman-acdfb4d14f15814a1178985cce7175eaa13acd6a.tar.gz
podman-acdfb4d14f15814a1178985cce7175eaa13acd6a.tar.bz2
podman-acdfb4d14f15814a1178985cce7175eaa13acd6a.zip
Merge pull request #14366 from jwhonce/wip/rm_todo
Support remote deadlock errors in rm
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/containers/rm.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go
index 420e3c38d..62143bbec 100644
--- a/cmd/podman/containers/rm.go
+++ b/cmd/podman/containers/rm.go
@@ -123,9 +123,7 @@ func rm(cmd *cobra.Command, args []string) error {
// removeContainers will set the exit code according to the `podman-rm` man
// page.
func removeContainers(namesOrIDs []string, rmOptions entities.RmOptions, setExit bool) error {
- var (
- errs utils.OutputErrors
- )
+ var errs utils.OutputErrors
responses, err := registry.ContainerEngine().ContainerRm(context.Background(), namesOrIDs, rmOptions)
if err != nil {
if setExit {
@@ -135,8 +133,9 @@ func removeContainers(namesOrIDs []string, rmOptions entities.RmOptions, setExit
}
for _, r := range responses {
if r.Err != nil {
- // TODO this will not work with the remote client
- if errors.Cause(err) == define.ErrWillDeadlock {
+ // When using the API, errors.Cause(err) will never equal constant define.ErrWillDeadLock
+ if errors.Cause(r.Err) == define.ErrWillDeadlock ||
+ errors.Cause(r.Err).Error() == define.ErrWillDeadlock.Error() {
logrus.Errorf("Potential deadlock detected - please run 'podman system renumber' to resolve")
}
if setExit {