Skip to content

Commit

Permalink
Merge pull request #15494 from vrothberg/fix-15492
Browse files Browse the repository at this point in the history
libpod: UpdateContainerStatus: do not wait for container
  • Loading branch information
openshift-merge-robot authored Aug 26, 2022
2 parents ff96bc4 + 15aeccb commit b1cbcff
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions libpod/oci_conmon_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit b1cbcff

Please sign in to comment.