diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-10 12:52:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-10 12:52:30 +0200 |
| commit | c47f714fe8193cd1ac90a9359da3ef177a6db7e1 (patch) | |
| tree | 1bb873259e76f27c9fb65139af052f22dd34a8c9 /libpod | |
| parent | 0a653153ef8e417def0ae341004df36a23761991 (diff) | |
| parent | 48d26a893e0adcf5f9b339a675bfffe688a9ea22 (diff) | |
| download | podman-c47f714fe8193cd1ac90a9359da3ef177a6db7e1.tar.gz podman-c47f714fe8193cd1ac90a9359da3ef177a6db7e1.tar.bz2 podman-c47f714fe8193cd1ac90a9359da3ef177a6db7e1.zip | |
Merge pull request #11880 from rhatdan/stoptimeout
Warn if podman stop timeout expires that sigkill was sent
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 0369a9977..1719b2dfa 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -441,7 +441,8 @@ func (r *ConmonOCIRuntime) StopContainer(ctr *Container, timeout uint, all bool) } if err := waitContainerStop(ctr, time.Duration(timeout)*time.Second); err != nil { - logrus.Infof("Timed out stopping container %s, resorting to SIGKILL: %v", ctr.ID(), err) + logrus.Debugf("Timed out stopping container %s with %s, resorting to SIGKILL: %v", ctr.ID(), unix.SignalName(syscall.Signal(stopSignal)), err) + logrus.Warnf("StopSignal %s failed to stop container %s in %d seconds, resorting to SIGKILL", unix.SignalName(syscall.Signal(stopSignal)), ctr.Name(), timeout) } else { // No error, the container is dead return nil |