diff options
| author | myml <wurongjie1@gmail.com> | 2022-02-08 09:13:06 +0800 |
|---|---|---|
| committer | myml <wurongjie1@gmail.com> | 2022-02-08 09:15:45 +0800 |
| commit | 58adf1a835969b31d2f312d7ab22fe821f40c7e2 (patch) | |
| tree | c8cd30a48f0797ccb56ba13b517b35b1d12d413f /libpod | |
| parent | 46d9a2570ad3eb4f1d7fe0928927e644ebe8a2a3 (diff) | |
| download | podman-58adf1a835969b31d2f312d7ab22fe821f40c7e2.tar.gz podman-58adf1a835969b31d2f312d7ab22fe821f40c7e2.tar.bz2 podman-58adf1a835969b31d2f312d7ab22fe821f40c7e2.zip | |
fix: Multiplication of durations
'killContainerTimeout' is already 5 second
[NO NEW TESTS NEEDED]
Signed-off-by: myml <wurongjie1@gmail.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 2 |
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) } |