aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormyml <wurongjie1@gmail.com>2022-02-08 09:13:06 +0800
committerMatthew Heon <matthew.heon@pm.me>2022-02-10 14:01:42 -0500
commit6d01b6dd63132f06c97418799dc200efe6b144db (patch)
tree1d9afb4013e5246a1b6ff87f68fdf2064abf212c
parented60f8908672a251a6cd366c42152c100dbf68f7 (diff)
downloadpodman-6d01b6dd63132f06c97418799dc200efe6b144db.tar.gz
podman-6d01b6dd63132f06c97418799dc200efe6b144db.tar.bz2
podman-6d01b6dd63132f06c97418799dc200efe6b144db.zip
fix: Multiplication of durations
'killContainerTimeout' is already 5 second [NO NEW TESTS NEEDED] Signed-off-by: myml <wurongjie1@gmail.com>
-rw-r--r--libpod/oci_conmon_exec_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go
index 04deaac83..aa970bbde 100644
--- a/libpod/oci_conmon_exec_linux.go
+++ b/libpod/oci_conmon_exec_linux.go
@@ -257,7 +257,7 @@ func (r *ConmonOCIRuntime) ExecStopContainer(ctr *Container, sessionID string, t
}
// Wait for the PID to stop
- if err := waitPidStop(pid, killContainerTimeout*time.Second); err != nil {
+ if err := waitPidStop(pid, killContainerTimeout); err != nil {
return errors.Wrapf(err, "timed out waiting for container %s exec session %s PID %d to stop after SIGKILL", ctr.ID(), sessionID, pid)
}