Merge pull request #54099 from dchen1107/docker

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.

Merge pull request #54099 from dchen1107/docker
664c7e8c · Kubernetes Submit Queue · GitHub · ecdf31d5 · fe36fdde · 664c7e8c
Unverified Commit 664c7e8c authored Nov 10, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

health-monitor.sh cluster/gce/gci/health-monitor.sh +1 -1

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