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

Merge pull request #14258 from mheon/no_hard_error_on_exec_cleanup

Browse Source 
Make errors on removing exec sessions nonfatal
This commit is contained in:
OpenShift Merge Robot
2022-05-17 11:10:52 +02:00
committed by GitHub
parent e28d46b76b dc435ecb22
commit 4a78992ac7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/runtime_ctr.go
View File

@ -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 // after setting the state to ContainerStateRemoving will prevent that the container is
// restarted // restarted
if err := c.removeAllExecSessions(); err != nil { 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 // Stop the container's storage