Merge pull request #18906 from MikeSpreitzer/issue/18721

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-06 14:09:36 -08:00

View File

@@ -49,6 +49,7 @@ import (
const (
containerPollTime = 1 * time.Second
lostPodPollTime = 1 * time.Minute
podRelistPeriod = 5 * time.Minute
)
@@ -656,7 +657,7 @@ func (k *Executor) __launchTask(driver bindings.ExecutorDriver, taskId, podFullN
// Wait for the pod to go away and stop monitoring once it does
// TODO (jdefelice) replace with an /events watch?
for {
time.Sleep(containerPollTime)
time.Sleep(lostPodPollTime)
if k.checkForLostPodTask(driver, taskId, knownPod) {
return
}