diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-07-02 19:10:51 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-07-02 19:10:51 -0400 |
| commit | 38c6199b80c5de5d965ab1bcf05820567a36813c (patch) | |
| tree | 4482ee00d2ecbed1edbdf978f749226e9722afa7 | |
| parent | a1bb1987cc78dead96ef84086020f74b7c44c700 (diff) | |
| download | podman-38c6199b80c5de5d965ab1bcf05820567a36813c.tar.gz podman-38c6199b80c5de5d965ab1bcf05820567a36813c.tar.bz2 podman-38c6199b80c5de5d965ab1bcf05820567a36813c.zip | |
Wipe PID and ConmonPID in state after container stops
Matches the behavior of Docker.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| -rw-r--r-- | libpod/container_internal.go | 2 | ||||
| -rw-r--r-- | libpod/oci.go | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 29df233b0..cb6c35049 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1044,6 +1044,8 @@ func (c *Container) stop(timeout uint) error { return err } + c.state.PID = 0 + c.state.ConmonPID = 0 c.state.StoppedByUser = true if err := c.save(); err != nil { return errors.Wrapf(err, "error saving container %s state after stopping", c.ID()) diff --git a/libpod/oci.go b/libpod/oci.go index efb5e42cc..fdd783100 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -234,6 +234,8 @@ func (r *OCIRuntime) updateContainerStatus(ctr *Container, useRuntime bool) erro // Alright, it exists. Transition to Stopped state. ctr.state.State = define.ContainerStateStopped + ctr.state.PID = 0 + ctr.state.ConmonPID = 0 // Read the exit file to get our stopped time and exit code. return ctr.handleExitFile(exitFile, info) |