github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #21347 from yujuhong/health_check 

Switch to using `docker version` as health check
pull/6/head
Phillip Wittrock 2016-02-17 14:48:44 -08:00
parent abd92a2112 b92e2903fa
commit a8744279eb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/trusty/configure.sh
View File

@ -261,7 +261,7 @@ health_monitoring() {
# We simply kill the process when there is a failure. Another upstart job will automatically # We simply kill the process when there is a failure. Another upstart job will automatically
# restart the process. # restart the process.
while [ 1 ]; do while [ 1 ]; do
if ! timeout 20 docker ps > /dev/null; then if ! timeout 10 docker version > /dev/null; then
echo "Docker daemon failed!" echo "Docker daemon failed!"
pkill docker pkill docker
fi fi

2
cluster/saltbase/salt/supervisor/docker-checker.sh
View File

@ -25,7 +25,7 @@ echo "waiting a minute for startup"
sleep 60 sleep 60
while true; do while true; do
if ! sudo timeout 20 docker ps > /dev/null; then if ! sudo timeout 10 docker version > /dev/null; then
echo "Docker failed!" echo "Docker failed!"
exit 2 exit 2
fi fi