From 39e11bac6b41ce289e1123a94d55ccae3344ddf3 Mon Sep 17 00:00:00 2001 From: Eli Qiao Date: Thu, 12 Nov 2015 09:08:32 +0800 Subject: [PATCH] Swarm: Add TimeoutStartSec=300 to docker service The default value of TimeoutStartSec=90, but it will fail on gate. set TimeoutStartSec=300 to docker service. It is hard to decide which one is the best choice, I tested on gate, 180 is fine, some other guys tested on their local setup, said 4 mins, let's hard code it as 300s first, if docker failed to start at 5 mins, it would be failed. see link [1] for reference. [1] http://man7.org/linux/man-pages/man5/systemd.service.5.html Co-Authored-By: Kai Qiang Wu Partially implements: blueprint swarm-functional-testing Change-Id: I4fe4f607a2353010092ff565a7189ad3189b0ea9 --- magnum/templates/swarm/fragments/write-docker-service.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/magnum/templates/swarm/fragments/write-docker-service.sh b/magnum/templates/swarm/fragments/write-docker-service.sh index a664a7a352..c1e1f45006 100644 --- a/magnum/templates/swarm/fragments/write-docker-service.sh +++ b/magnum/templates/swarm/fragments/write-docker-service.sh @@ -12,6 +12,7 @@ After=network.target docker.socket Requires=docker.socket [Service] +TimeoutStartSec=300 Type=notify EnvironmentFile=-/etc/sysconfig/docker EnvironmentFile=-/etc/sysconfig/docker-storage