github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18906 from MikeSpreitzer/issue/18721

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-06 14:09:36 -08:00
parent 9724447456 b35aec769b
commit 2a1e51cb5a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/mesos/pkg/executor/executor.go
View File

@@ -49,6 +49,7 @@ import (
const ( const (
containerPollTime = 1 * time.Second containerPollTime = 1 * time.Second
lostPodPollTime = 1 * time.Minute
podRelistPeriod = 5 * 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 // Wait for the pod to go away and stop monitoring once it does
// TODO (jdefelice) replace with an /events watch? // TODO (jdefelice) replace with an /events watch?
for { for {
time.Sleep(containerPollTime) time.Sleep(lostPodPollTime)
if k.checkForLostPodTask(driver, taskId, knownPod) { if k.checkForLostPodTask(driver, taskId, knownPod) {
return return
} }