From 2f9e7a067a7273a0f344c1c9a6397e4bb61d7554 Mon Sep 17 00:00:00 2001 From: David Xia Date: Wed, 20 May 2015 14:15:47 -0400 Subject: [PATCH] Increase upstart kill timeout to 20 seconds Give Docker more time to kill containers before upstart kills Docker. The default kill timeout is 5 seconds. This will help decrease the chance of but not eliminate the chance of orphaned container processes. Signed-off-by: David Xia --- contrib/init/upstart/docker.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/init/upstart/docker.conf b/contrib/init/upstart/docker.conf index 5e8df6e3c2..52721312dd 100644 --- a/contrib/init/upstart/docker.conf +++ b/contrib/init/upstart/docker.conf @@ -7,6 +7,8 @@ limit nproc 524288 1048576 respawn +kill timeout 20 + pre-start script # see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount if grep -v '^#' /etc/fstab | grep -q cgroup \