diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-09-29 10:03:46 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-10-08 07:06:37 -0400 |
| commit | 48d26a893e0adcf5f9b339a675bfffe688a9ea22 (patch) | |
| tree | 6b889b7972e9ed0a1390bc256e98b2a7d1e2d87d /libpod | |
| parent | 14c0fcc6b7b3e8c1f28efea329ab9a6bf0d99b70 (diff) | |
| download | podman-48d26a893e0adcf5f9b339a675bfffe688a9ea22.tar.gz podman-48d26a893e0adcf5f9b339a675bfffe688a9ea22.tar.bz2 podman-48d26a893e0adcf5f9b339a675bfffe688a9ea22.zip | |
Warn if podman stop timeout expires that sigkill was sent
Note: the Warning message will not come to podman-remote.
It would be difficult to plumb, and not really worth the effort.
Fixes: https://github.com/containers/podman/issues/11854
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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 |