Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
156d3011
Commit
156d3011
authored
Feb 02, 2016
by
Yu-Ju Hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change docker health checker to using `docker ps`
`docker ps` is a more reliable health check than docker version from past experiences.
parent
26b6b18f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
node.yaml
cluster/gce/trusty/node.yaml
+1
-1
docker-checker.sh
cluster/saltbase/salt/supervisor/docker-checker.sh
+1
-1
No files found.
cluster/gce/trusty/node.yaml
View file @
156d3011
...
@@ -258,7 +258,7 @@ script
...
@@ -258,7 +258,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
...
...
cluster/saltbase/salt/supervisor/docker-checker.sh
View file @
156d3011
...
@@ -25,7 +25,7 @@ echo "waiting a minute for startup"
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment