kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Make debian init work when called quickly.

Browse source 
We use the start-stop-daemon pid creation mechanism in addition the intrinsic built into docker.  This means the pid file is guaranteed to be written out by the time the script exits.

See #6184.

Docker-DCO-1.1-Signed-off-by: Joe Beda <joe.github@bedafamily.com> (github: jbeda)
This commit is contained in:
Joe Beda 2014-06-03 16:28:06 -07:00
parent 2c27e6e9ab
commit c11fadb282
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/init/sysvinit-debian/docker
View file

@ -22,7 +22,10 @@ BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/docker) # modify these in /etc/default/$BASE (/etc/default/docker)
DOCKER=/usr/bin/$BASE DOCKER=/usr/bin/$BASE
# This is the pid file managed by docker itself
DOCKER_PIDFILE=/var/run/$BASE.pid DOCKER_PIDFILE=/var/run/$BASE.pid
# This is the pid file created/managed by start-stop-daemon
DOCKER_SSD_PIDFILE=/var/run/$BASE-ssd.pid
DOCKER_LOGFILE=/var/log/$BASE.log DOCKER_LOGFILE=/var/log/$BASE.log
DOCKER_OPTS= DOCKER_OPTS=
DOCKER_DESC="Docker" DOCKER_DESC="Docker"
@ -89,7 +92,8 @@ case "$1" in
start-stop-daemon --start --background \ start-stop-daemon --start --background \
--no-close \ --no-close \
--exec "$DOCKER" \ --exec "$DOCKER" \
--pidfile "$DOCKER_PIDFILE" \ --pidfile "$DOCKER_SSD_PIDFILE" \
--make-pidfile \
-- \ -- \
-d -p "$DOCKER_PIDFILE" \ -d -p "$DOCKER_PIDFILE" \
$DOCKER_OPTS \ $DOCKER_OPTS \
@ -100,13 +104,13 @@ case "$1" in
stop) stop)
fail_unless_root fail_unless_root
log_begin_msg "Stopping $DOCKER_DESC: $BASE" log_begin_msg "Stopping $DOCKER_DESC: $BASE"
start-stop-daemon --stop --pidfile "$DOCKER_PIDFILE" start-stop-daemon --stop --pidfile "$DOCKER_SSD_PIDFILE"
log_end_msg $? log_end_msg $?
;; ;;
restart) restart)
fail_unless_root fail_unless_root
docker_pid=`cat "$DOCKER_PIDFILE" 2>/dev/null` docker_pid=`cat "$DOCKER_SSD_PIDFILE" 2>/dev/null`
[ -n "$docker_pid" ] \ [ -n "$docker_pid" ] \
&& ps -p $docker_pid > /dev/null 2>&1 \ && ps -p $docker_pid > /dev/null 2>&1 \
&& $0 stop && $0 stop
@ -119,7 +123,7 @@ case "$1" in
;; ;;
status) status)
status_of_proc -p "$DOCKER_PIDFILE" "$DOCKER" docker status_of_proc -p "$DOCKER_SSD_PIDFILE" "$DOCKER" docker
;; ;;
*) *)