diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-28 03:06:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 03:06:51 -0400 |
| commit | c0d9ecd299602bd2ee28d5ac65f7671e2d642784 (patch) | |
| tree | ea9faa1a27a3634e7ca7da7cebf7bbbc220ababe | |
| parent | b933b8a1c1f5de82fb201f340a5de82f49d2a0bb (diff) | |
| parent | 389a4a6cc6ce560c805338e1af6d4f78df57bdb9 (diff) | |
| download | podman-c0d9ecd299602bd2ee28d5ac65f7671e2d642784.tar.gz podman-c0d9ecd299602bd2ee28d5ac65f7671e2d642784.tar.bz2 podman-c0d9ecd299602bd2ee28d5ac65f7671e2d642784.zip | |
Merge pull request #15090 from vrothberg/fix-14859
cleanup: transition from `stopping` to `exited`
| -rw-r--r-- | libpod/container_internal.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 7e330430c..bad68991b 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -347,7 +347,7 @@ func (c *Container) syncContainer() error { } // If runtime knows about the container, update its status in runtime // And then save back to disk - if c.ensureState(define.ContainerStateCreated, define.ContainerStateRunning, define.ContainerStateStopped, define.ContainerStatePaused) { + if c.ensureState(define.ContainerStateCreated, define.ContainerStateRunning, define.ContainerStateStopped, define.ContainerStateStopping, define.ContainerStatePaused) { oldState := c.state.State if err := c.checkExitFile(); err != nil { @@ -1316,10 +1316,10 @@ func (c *Container) stop(timeout uint) error { // Since we're now subject to a race condition with other processes who // may have altered the state (and other data), let's check if the - // state has changed. If so, we should return immediately and log a - // warning. + // state has changed. If so, we should return immediately and leave + // breadcrumbs for debugging if needed. if c.state.State != define.ContainerStateStopping { - logrus.Warnf( + logrus.Debugf( "Container %q state changed from %q to %q while waiting for it to be stopped: discontinuing stop procedure as another process interfered", c.ID(), define.ContainerStateStopping, c.state.State, ) |