Merge pull request #39691 from yujuhong/bump_timeout

Automatic merge from submit-queue (batch tested with PRs 39694, 39383, 39651, 39691, 39497) Bump container-linux and gci timeout for docker health check The command `docker ps` can take longer time to respond under heavy load or when encountering some known issues. In these cases, the containers are running fine, so aggressive health check could cause serious disruption. Bump the timeout to 60s to be consistent with the debian-based containerVM. This addresses #38588

Merge pull request #39691 from yujuhong/bump_timeout
ebc8e406 · Kubernetes Submit Queue · GitHub · 95968754 · 4e87973a · ebc8e406
Commit ebc8e406 authored Jan 10, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

health-monitor.sh cluster/gce/container-linux/health-monitor.sh +1 -1

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

No files found.
--- a/cluster/gce/container-linux/health-monitor.sh
+++ b/cluster/gce/container-linux/health-monitor.sh
@@ -26,7 +26,7 @@ set -o pipefail
 # automatically restart the process.
 function docker_monitoring {
  while [ 1 ]; do
-    if ! timeout 10 docker ps > /dev/null; then
+    if ! timeout 60 docker ps > /dev/null; then
      echo "Docker daemon failed!"
      pkill docker
      # Wait for a while, as we don't want to kill it again before it is really up.

--- a/cluster/gce/gci/health-monitor.sh
+++ b/cluster/gce/gci/health-monitor.sh
@@ -26,7 +26,7 @@ set -o pipefail
 # automatically restart the process.
 function docker_monitoring {
  while [ 1 ]; do
-    if ! timeout 10 docker ps > /dev/null; then
+    if ! timeout 60 docker ps > /dev/null; then
      echo "Docker daemon failed!"
      pkill docker
      # Wait for a while, as we don't want to kill it again before it is really up.