mirror of
https://github.com/containers/podman.git
synced 2026-10-20 08:55:09 -04:00
Fix invalid wait condition on kill
When using the compatability tests on kill, the kill function goes into an infinite wait loop taking all of the CPU. This change will use the correct wait function and exit properly. Fixes: https://github.com/containers/podman/issues/9206 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
2 files changed
+11
-2
No files matched your search
@@ -233,8 +233,8 @@ func KillContainer(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
if sig == 0 || syscall.Signal(sig) == syscall.SIGKILL {
|
||||
var opts entities.WaitOptions
|
||||
if _, err := containerEngine.ContainerWait(r.Context(), []string{name}, opts); err != nil {
|
||||
if _, err := utils.WaitContainer(w, r); err != nil {
|
||||
|
||||
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user