summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-07 15:06:02 -0400
committerGitHub <noreply@github.com>2020-10-07 15:06:02 -0400
commit0e1d01103e45430693736dac10be13c49cf23f03 (patch)
treeaed0f84e88d4e4de22b5e262761e95c951f4f610 /pkg/api
parent9ae873e60e149677db66782eaf2b4ed1402e97d2 (diff)
parent55f5e4af11a2428b14b36bbdcd4b1d91e868d786 (diff)
downloadpodman-0e1d01103e45430693736dac10be13c49cf23f03.tar.gz
podman-0e1d01103e45430693736dac10be13c49cf23f03.tar.bz2
podman-0e1d01103e45430693736dac10be13c49cf23f03.zip
Merge pull request #7382 from mheon/pod_parallel
Move pod jobs to parallel execution
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/libpod/pods.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index 3aa554171..5422411cf 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -270,7 +270,7 @@ func PodPause(w http.ResponseWriter, r *http.Request) {
utils.PodNotFound(w, name, err)
return
}
- responses, err := pod.Pause()
+ responses, err := pod.Pause(r.Context())
if err != nil && errors.Cause(err) != define.ErrPodPartialFail {
utils.Error(w, "Something went wrong", http.StatusInternalServerError, err)
return
@@ -294,7 +294,7 @@ func PodUnpause(w http.ResponseWriter, r *http.Request) {
utils.PodNotFound(w, name, err)
return
}
- responses, err := pod.Unpause()
+ responses, err := pod.Unpause(r.Context())
if err != nil && errors.Cause(err) != define.ErrPodPartialFail {
utils.Error(w, "failed to pause pod", http.StatusInternalServerError, err)
return
@@ -402,7 +402,7 @@ func PodKill(w http.ResponseWriter, r *http.Request) {
return
}
- responses, err := pod.Kill(uint(sig))
+ responses, err := pod.Kill(r.Context(), uint(sig))
if err != nil && errors.Cause(err) != define.ErrPodPartialFail {
utils.Error(w, "failed to kill pod", http.StatusInternalServerError, err)
return