github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Avesh Agarwal
2016-09-01 16:23:00 -04:00
parent a2961b3b4b
commit 83f447e6a6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1529,6 +1529,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"
) )