diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-08 10:58:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 10:58:20 -0500 |
| commit | 119f8bc6c7e56c37f65bdd9671e7a2960ac3f1f1 (patch) | |
| tree | 102a1a7e3eb9c722a9e71e937ea92bb2e0c62516 | |
| parent | cbd0980d5b28fca1ea5192b73ccf92506e562691 (diff) | |
| parent | 58adf1a835969b31d2f312d7ab22fe821f40c7e2 (diff) | |
| download | podman-119f8bc6c7e56c37f65bdd9671e7a2960ac3f1f1.tar.gz podman-119f8bc6c7e56c37f65bdd9671e7a2960ac3f1f1.tar.bz2 podman-119f8bc6c7e56c37f65bdd9671e7a2960ac3f1f1.zip | |
Merge pull request #13163 from myml/myml/fix-duration
fix: Multiplication of durations
| -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) } |