From a1bb1987cc78dead96ef84086020f74b7c44c700 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 2 Jul 2019 18:52:55 -0400 Subject: Store Conmon's PID in our state and display in inspect Signed-off-by: Matthew Heon --- libpod/container_internal.go | 1 + 1 file changed, 1 insertion(+) (limited to 'libpod/container_internal.go') diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 43d2b6e61..29df233b0 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -452,6 +452,7 @@ func (c *Container) teardownStorage() error { // It does not save the results - assumes the database will do that for us func resetState(state *ContainerState) error { state.PID = 0 + state.ConmonPID = 0 state.Mountpoint = "" state.Mounted = false if state.State != define.ContainerStateExited { -- cgit v1.2.3-54-g00ecf From 38c6199b80c5de5d965ab1bcf05820567a36813c Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 2 Jul 2019 19:10:51 -0400 Subject: Wipe PID and ConmonPID in state after container stops Matches the behavior of Docker. Signed-off-by: Matthew Heon --- libpod/container_internal.go | 2 ++ libpod/oci.go | 2 ++ 2 files changed, 4 insertions(+) (limited to 'libpod/container_internal.go') 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) -- cgit v1.2.3-54-g00ecf