From fae9bae1aa682e982571d2eb0902443625d07954 Mon Sep 17 00:00:00 2001 From: Pingan2017 Date: Tue, 13 Nov 2018 15:19:26 +0800 Subject: [PATCH] correct log output when specifed delete gracePeriod < minimumGracePeriodInSeconds --- pkg/kubelet/kuberuntime/kuberuntime_container.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 9407a03c63a..42609246fc2 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -556,8 +556,6 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec gracePeriod = *pod.Spec.TerminationGracePeriodSeconds } - klog.V(2).Infof("Killing container %q with %d second grace period", containerID.String(), gracePeriod) - // Run internal pre-stop lifecycle hook if err := m.internalLifecycle.PreStopContainer(containerID.ID); err != nil { return err @@ -576,6 +574,8 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec klog.V(3).Infof("Killing container %q, but using %d second grace period override", containerID, gracePeriod) } + klog.V(2).Infof("Killing container %q with %d second grace period", containerID.String(), gracePeriod) + err := m.runtimeService.StopContainer(containerID.ID, gracePeriod) if err != nil { klog.Errorf("Container %q termination failed with gracePeriod %d: %v", containerID.String(), gracePeriod, err)