diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-17 11:10:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 11:10:52 +0200 |
| commit | 4a78992ac71547d39c61eadd5fafac0aa1cb57f9 (patch) | |
| tree | 3508cb62a3df695706dc0bb9c830af82205dc6df /libpod | |
| parent | e28d46b76b630fb97b6d405dda058fd32701de63 (diff) | |
| parent | dc435ecb22fed044ccc348428cbd8160b36977f2 (diff) | |
| download | podman-4a78992ac71547d39c61eadd5fafac0aa1cb57f9.tar.gz podman-4a78992ac71547d39c61eadd5fafac0aa1cb57f9.tar.bz2 podman-4a78992ac71547d39c61eadd5fafac0aa1cb57f9.zip | |
Merge pull request #14258 from mheon/no_hard_error_on_exec_cleanup
Make errors on removing exec sessions nonfatal
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_ctr.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index df7174ac6..7e8a21a8c 100644 --- 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 |