diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-30 09:35:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 09:35:51 -0400 |
| commit | 01c76691154eb0569b76d91c673153897e2f7653 (patch) | |
| tree | ed81d9583ec06c232a17a18bd5badcbd14518e69 | |
| parent | 754ec89a8a185d308ca5ed08afaf34d6cbda08da (diff) | |
| parent | 8ed9354f4c9a084cb296bf4d6585ff19bd33f25f (diff) | |
| download | podman-01c76691154eb0569b76d91c673153897e2f7653.tar.gz podman-01c76691154eb0569b76d91c673153897e2f7653.tar.bz2 podman-01c76691154eb0569b76d91c673153897e2f7653.zip | |
Merge pull request #15521 from vrothberg/v4.2-fix-15492
[v4.2] libpod: UpdateContainerStatus: do not wait for container
| -rw-r--r-- | libpod/oci_conmon_linux.go | 9 | ||||
| -rw-r--r-- | test/apiv2/10-images.at | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index cb76de72c..c8378e124 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -337,15 +337,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) { diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index f03b95786..4fd954e37 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -203,7 +203,7 @@ t POST "build?dockerfile=containerfile" $CONTAINERFILE_TAR application/json 200 # Libpod: allow building from url: https://github.com/alpinelinux/docker-alpine.git and must ignore any provided tar t POST "libpod/build?remote=https%3A%2F%2Fgithub.com%2Falpinelinux%2Fdocker-alpine.git" $CONTAINERFILE_TAR 200 \ - .stream~"STEP 1/5: FROM alpine:3.14" + .stream~"STEP 1/5: FROM alpine:" # Build api response header must contain Content-type: application/json t POST "build?dockerfile=containerfile" $CONTAINERFILE_TAR application/json 200 |