diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-04-12 14:43:58 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 11:25:18 -0400 |
| commit | ac753308e877824f6094600d36b00cea3aa098b3 (patch) | |
| tree | 0ee1f838c7a23abfdf7a2e8991be812515ddd38e | |
| parent | 443efc6134671aa41fb5b324542f57b4184421fb (diff) | |
| download | podman-ac753308e877824f6094600d36b00cea3aa098b3.tar.gz podman-ac753308e877824f6094600d36b00cea3aa098b3.tar.bz2 podman-ac753308e877824f6094600d36b00cea3aa098b3.zip | |
Do not delete container twice
10 lines above we had
// Set ContainerStateRemoving
c.state.State = define.ContainerStateRemoving
Which causes the state to not be the two checked states. Since the
c.cleanup call already deleted the OCI state, this meant that we were
calling cleanup, and hence the postHook hook twice.
Fixes: https://github.com/containers/podman/issues/9983
[NO TESTS NEEDED] Since it would be difficult to tests this. Main tests
should handle that the container is being deleted successfully.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | libpod/runtime_ctr.go | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 537618b65..f9b5c5c51 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -616,20 +616,6 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo } } - // Delete the container. - // Not needed in Configured and Exited states, where the container - // doesn't exist in the runtime - if c.state.State != define.ContainerStateConfigured && - c.state.State != define.ContainerStateExited { - if err := c.delete(ctx); err != nil { - if cleanupErr == nil { - cleanupErr = err - } else { - logrus.Errorf("delete container: %v", err) - } - } - } - // Remove the container from the state if c.config.Pod != "" { // If we're removing the pod, the container will be evicted |