github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20509 from yujuhong/docker_health

Browse Source 
Change docker health checker to using `docker ps`
This commit is contained in:
Jeff Lowdermilk 2016-02-02 11:50:04 -08:00
commit ec4b94aabc
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/node.yaml
View File

@ -281,7 +281,7 @@ script
# 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 10 docker version > /dev/null; then if ! timeout 20 docker ps > /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 10 docker version > /dev/null; then if ! sudo timeout 20 docker ps > /dev/null; then
echo "Docker failed!" echo "Docker failed!"
exit 2 exit 2
fi fi