Merge pull request #19863 from mheon/fix_18874

Ignore spurious container-removal errors
containers · Sep 6, 2023 · f14360f · f14360f
2 parents d7b7b20 + 71549c6
commit f14360f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
@@ -916,12 +916,16 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, opts ctrRmO
 			}
 			ctrs, pods, err := r.removeContainer(ctx, dep, recursiveOpts)
 			for rmCtr, err := range ctrs {
-				removedCtrs[rmCtr] = err
+				if errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, define.ErrCtrRemoved) {
+					removedCtrs[rmCtr] = nil
+				} else {
+					removedCtrs[rmCtr] = err
+				}
 			}
 			for rmPod, err := range pods {
 				removedPods[rmPod] = err
 			}
-			if err != nil {
+			if err != nil && !errors.Is(err, define.ErrNoSuchCtr) && !errors.Is(err, define.ErrCtrRemoved) {
 				retErr = err
 				return
 			}