From 6c5f07d58e92920850d4adf4a6a44c5d73509f30 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Mon, 22 Feb 2016 11:40:28 -0800 Subject: [PATCH] Make sure docker is properly shutdown before startup. --- cluster/saltbase/salt/supervisor/docker-checker.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cluster/saltbase/salt/supervisor/docker-checker.sh b/cluster/saltbase/salt/supervisor/docker-checker.sh index 05492e75589..3f40971a3bd 100755 --- a/cluster/saltbase/salt/supervisor/docker-checker.sh +++ b/cluster/saltbase/salt/supervisor/docker-checker.sh @@ -19,10 +19,16 @@ # which in turn restarts docker. /etc/init.d/docker stop +# Make sure docker gracefully terminated before start again +while pidof docker > /dev/null; do + echo "waiting clean shutdown" + sleep 10 +done + /etc/init.d/docker start -echo "waiting a minute for startup" -sleep 60 +echo "waiting 30s for startup" +sleep 30 while true; do if ! sudo timeout 10 docker version > /dev/null; then