From cfaf0bf98f76ad963ae49f01604e2d20eead9f8c Mon Sep 17 00:00:00 2001 From: Steven Merrill Date: Wed, 17 Sep 2014 16:42:25 -0400 Subject: [PATCH] Try to avoid issues when the Docker daemon restarts. This change will allow the Docker daemon's init script to wait up to 5 minutes before being forcibly terminated by the initscript. Many non-trivial containers will take more than the default 3 seconds to stop, which can result in containers whose rootfs is still mounted and will not restart when the daemon starts up again, or worse, orphan processes that are still running. Signed-off-by: Steven Merrill Upstream-commit: 640d2ef6f54d96ac4fc3f0f745cb1e6a35148607 Component: engine --- components/engine/contrib/init/sysvinit-redhat/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/contrib/init/sysvinit-redhat/docker b/components/engine/contrib/init/sysvinit-redhat/docker index 0c985094e6..eadf02c75c 100755 --- a/components/engine/contrib/init/sysvinit-redhat/docker +++ b/components/engine/contrib/init/sysvinit-redhat/docker @@ -68,7 +68,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc -p $pidfile $prog + killproc -p $pidfile -d 300 $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile