opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 20:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15494 from vrothberg/fix-15492

Browse Source 
libpod: UpdateContainerStatus: do not wait for container
This commit is contained in:
OpenShift Merge Robot
2022-08-26 16:23:46 -04:00
committed by GitHub
parent ff96bc47e3 15aeccb834
commit b1cbcff5c5
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/oci_conmon_common.go
View File

@ -277,15 +277,6 @@ func (r *ConmonOCIRuntime) UpdateContainerStatus(ctr *Container) error {
ctr.ID(), state.Status, define.ErrInternal) 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 // Handle ContainerStateStopping - keep it unless the container
// transitioned to no longer running. // transitioned to no longer running.
if oldState == define.ContainerStateStopping && (ctr.state.State == define.ContainerStatePaused || ctr.state.State == define.ContainerStateRunning) { if oldState == define.ContainerStateStopping && (ctr.state.State == define.ContainerStatePaused || ctr.state.State == define.ContainerStateRunning) {