diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-17 21:08:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 21:08:32 +0200 |
| commit | 8caed305741c8c9e34ec767c9054e3c5e0d33576 (patch) | |
| tree | a52d68931d6f620ff66ac31b7ca6629b420f7b06 /pkg/api | |
| parent | 47108e2e093bae318773998a18f83d0504a402e0 (diff) | |
| parent | c4b2078508a45843034a86916b37a52d3e34d20d (diff) | |
| download | podman-8caed305741c8c9e34ec767c9054e3c5e0d33576.tar.gz podman-8caed305741c8c9e34ec767c9054e3c5e0d33576.tar.bz2 podman-8caed305741c8c9e34ec767c9054e3c5e0d33576.zip | |
Merge pull request #7283 from mheon/pod_infra_has_exit_cmd
Ensure pod infra containers have an exit command
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/libpod/pods.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 10e0d4ce9..6e704fe65 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -123,10 +123,17 @@ func PodStop(w http.ResponseWriter, r *http.Request) { } else { responses, stopError = pod.Stop(r.Context(), false) } - if stopError != nil { + if stopError != nil && errors.Cause(stopError) != define.ErrPodPartialFail { utils.Error(w, "Something went wrong", http.StatusInternalServerError, err) return } + // Try to clean up the pod - but only warn on failure, it's nonfatal. + if cleanupCtrs, cleanupErr := pod.Cleanup(r.Context()); cleanupErr != nil { + logrus.Errorf("Error cleaning up pod %s: %v", pod.ID(), cleanupErr) + for id, err := range cleanupCtrs { + logrus.Errorf("Error cleaning up pod %s container %s: %v", pod.ID(), id, err) + } + } var errs []error //nolint for _, err := range responses { errs = append(errs, err) |