diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-02-23 13:02:35 +0100 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-02-23 13:02:35 +0100 |
| commit | e5ac28f3b968661e5c2603880a5c4576d590f3dd (patch) | |
| tree | 378d34ca1cb862ea65deff2292085198a39770da /libpod/container_exec.go | |
| parent | 96fc9d983e0fc5bae48c3cec3acce86cdb6e1059 (diff) | |
| download | podman-e5ac28f3b968661e5c2603880a5c4576d590f3dd.tar.gz podman-e5ac28f3b968661e5c2603880a5c4576d590f3dd.tar.bz2 podman-e5ac28f3b968661e5c2603880a5c4576d590f3dd.zip | |
container removal: handle already removed containers
Since commit d54478d8eaec, a container's lock is released before
attempting to stop it via the OCI runtime. This opened the window
for various kinds of race conditions. One of them led to #9479 where
the removal+cleanup sequences of a `run --rm` session overlapped with
`rm -af`. Make both execution paths more robust by handling the case of
an already removed container.
Fixes: #9479
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod/container_exec.go')
| -rw-r--r-- | libpod/container_exec.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libpod/container_exec.go b/libpod/container_exec.go index 7b1d797bb..8d63ef90f 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -954,18 +954,22 @@ func (c *Container) removeAllExecSessions() error { } // Delete all exec sessions if err := c.runtime.state.RemoveContainerExecSessions(c); err != nil { - if lastErr != nil { - logrus.Errorf("Error stopping container %s exec sessions: %v", c.ID(), lastErr) + if errors.Cause(err) != define.ErrCtrRemoved { + if lastErr != nil { + logrus.Errorf("Error stopping container %s exec sessions: %v", c.ID(), lastErr) + } + lastErr = err } - lastErr = err } c.state.ExecSessions = nil c.state.LegacyExecSessions = nil if err := c.save(); err != nil { - if lastErr != nil { - logrus.Errorf("Error stopping container %s exec sessions: %v", c.ID(), lastErr) + if errors.Cause(err) != define.ErrCtrRemoved { + if lastErr != nil { + logrus.Errorf("Error stopping container %s exec sessions: %v", c.ID(), lastErr) + } + lastErr = err } - lastErr = err } return lastErr |