github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31911 from aveshagarwal/master-rhbz-1372425

Browse Source 
Automatic merge from submit-queue

Send a pod event if preStop hook did not complete in time.

Fixes https://github.com/kubernetes/kubernetes/issues/31902
@kubernetes/rh-cluster-infra @derekwaynecarr
This commit is contained in:
Kubernetes Submit Queue 2016-10-12 21:45:47 -07:00 committed by GitHub
commit f20e1cc4d0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockertools/docker_manager.go
View File

@ -1544,6 +1544,8 @@ func (dm *DockerManager) killContainer(containerID kubecontainer.ContainerID, co
select { select {
case <-time.After(time.Duration(gracePeriod) * time.Second): case <-time.After(time.Duration(gracePeriod) * time.Second):
glog.Warningf("preStop hook for container %q did not complete in %d seconds", name, gracePeriod) glog.Warningf("preStop hook for container %q did not complete in %d seconds", name, gracePeriod)
message := fmt.Sprintf("preStop hook for container %q did not complete in %d seconds", name, gracePeriod)
dm.generateFailedContainerEvent(containerID, pod.Name, events.UnfinishedPreStopHook, message)
case <-done: case <-done:
glog.V(4).Infof("preStop hook for container %q completed", name) glog.V(4).Infof("preStop hook for container %q completed", name)
} }

5
pkg/kubelet/events/event.go
View File

@ -72,6 +72,7 @@ const (
FailedValidation = "FailedValidation" FailedValidation = "FailedValidation"
// Lifecycle hooks // Lifecycle hooks
FailedPostStartHook = "FailedPostStartHook" FailedPostStartHook = "FailedPostStartHook"
FailedPreStopHook = "FailedPreStopHook" FailedPreStopHook = "FailedPreStopHook"
UnfinishedPreStopHook = "UnfinishedPreStopHook"
) )