diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-26 16:23:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-26 16:23:46 -0400 |
| commit | b1cbcff5c5f42fbd1cc62167e0021b4c27e25c5a (patch) | |
| tree | ad7e180ffdf5cf1b04f9ee5c41db837dd3a1bc1c | |
| parent | ff96bc47e39c4282baffa948d5169edd8bdad44f (diff) | |
| parent | 15aeccb8341d44510b3ec055678f010a2624b34e (diff) | |
| download | podman-b1cbcff5c5f42fbd1cc62167e0021b4c27e25c5a.tar.gz podman-b1cbcff5c5f42fbd1cc62167e0021b4c27e25c5a.tar.bz2 podman-b1cbcff5c5f42fbd1cc62167e0021b4c27e25c5a.zip | |
Merge pull request #15494 from vrothberg/fix-15492
libpod: UpdateContainerStatus: do not wait for container
| -rw-r--r-- | libpod/oci_conmon_common.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index c3725cdb4..b96f92d3a 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -277,15 +277,6 @@ func (r *ConmonOCIRuntime) UpdateContainerStatus(ctr *Container) error { ctr.ID(), state.Status, define.ErrInternal) } - // Only grab exit status if we were not already stopped - // If we were, it should already be in the database - if ctr.state.State == define.ContainerStateStopped && oldState != define.ContainerStateStopped { - if _, err := ctr.Wait(context.Background()); err != nil { - logrus.Errorf("Waiting for container %s to exit: %v", ctr.ID(), err) - } - return nil - } - // Handle ContainerStateStopping - keep it unless the container // transitioned to no longer running. if oldState == define.ContainerStateStopping && (ctr.state.State == define.ContainerStatePaused || ctr.state.State == define.ContainerStateRunning) { |