github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54099 from dchen1107/docker

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 54987, 55221, 54099, 55144, 54215). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Increase waiting time (120s) for docker startup in health-monitor.sh

Fix the issue of killing docker again when startup takes longer time on overloaded nodes.
This commit is contained in:
Kubernetes Submit Queue 2017-11-10 14:51:27 -08:00 committed by GitHub
commit 664c7e8cf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/gci/health-monitor.sh
View File

@ -30,7 +30,7 @@ function docker_monitoring {
echo "Docker daemon failed!" echo "Docker daemon failed!"
pkill docker pkill docker
# Wait for a while, as we don't want to kill it again before it is really up. # Wait for a while, as we don't want to kill it again before it is really up.
sleep 30 sleep 120
else else
sleep "${SLEEP_SECONDS}" sleep "${SLEEP_SECONDS}"
fi fi