Skip to content

Commit

Permalink
Merge pull request #13163 from myml/myml/fix-duration
Browse files Browse the repository at this point in the history
fix: Multiplication of durations
  • Loading branch information
openshift-merge-robot authored Feb 8, 2022
2 parents cbd0980 + 58adf1a commit 119f8bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion libpod/oci_conmon_exec_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down

0 comments on commit 119f8bc

Please sign in to comment.