github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct log output when specifed delete gracePeriod < minimumGracePeriodInSeconds

Browse Source
This commit is contained in:
Pingan2017 2018-11-13 15:19:26 +08:00
parent 468c99ea24
commit fae9bae1aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@ -556,8 +556,6 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec
gracePeriod = *pod.Spec.TerminationGracePeriodSeconds 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 // Run internal pre-stop lifecycle hook
if err := m.internalLifecycle.PreStopContainer(containerID.ID); err != nil { if err := m.internalLifecycle.PreStopContainer(containerID.ID); err != nil {
return err 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(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) err := m.runtimeService.StopContainer(containerID.ID, gracePeriod)
if err != nil { if err != nil {
klog.Errorf("Container %q termination failed with gracePeriod %d: %v", containerID.String(), gracePeriod, err) klog.Errorf("Container %q termination failed with gracePeriod %d: %v", containerID.String(), gracePeriod, err)