From 156d301140ee40a3f4c6ed11e40479c4e55670fa Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Tue, 2 Feb 2016 11:08:21 -0800 Subject: [PATCH] Change docker health checker to using `docker ps` `docker ps` is a more reliable health check than docker version from past experiences. --- cluster/gce/trusty/node.yaml | 2 +- cluster/saltbase/salt/supervisor/docker-checker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml index fde84c1e5b5..eb69e33b8b3 100644 --- a/cluster/gce/trusty/node.yaml +++ b/cluster/gce/trusty/node.yaml @@ -258,7 +258,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