diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml index 36164625658..e1d90ea539f 100644 --- a/cluster/gce/trusty/node.yaml +++ b/cluster/gce/trusty/node.yaml @@ -281,7 +281,7 @@ script # We simply kill the process when there is a failure. Another upstart job will automatically # restart the process. while [ 1 ]; do - if ! timeout 10 docker version > /dev/null; then + if ! timeout 20 docker ps > /dev/null; then echo "Docker daemon failed!" pkill docker fi diff --git a/cluster/saltbase/salt/supervisor/docker-checker.sh b/cluster/saltbase/salt/supervisor/docker-checker.sh index 05492e75589..22195033a17 100755 --- a/cluster/saltbase/salt/supervisor/docker-checker.sh +++ b/cluster/saltbase/salt/supervisor/docker-checker.sh @@ -25,7 +25,7 @@ echo "waiting a minute for startup" sleep 60 while true; do - if ! sudo timeout 10 docker version > /dev/null; then + if ! sudo timeout 20 docker ps > /dev/null; then echo "Docker failed!" exit 2 fi