Merge pull request #14258 from mheon/no_hard_error_on_exec_cleanup

Make errors on removing exec sessions nonfatal
containers · May 17, 2022 · 4a78992 · 4a78992
2 parents e28d46b + dc435ec
commit 4a78992
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
@@ -732,7 +732,11 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
 	// after setting the state to ContainerStateRemoving will prevent that the container is
 	// restarted
 	if err := c.removeAllExecSessions(); err != nil {
-		return err
+		if cleanupErr == nil {
+			cleanupErr = err
+		} else {
+			logrus.Errorf("Remove exec sessions: %v", err)
+		}
 	}
 
 	// Stop the container's storage