From 476d2fee09ceb2f968211f434f6a96d182d3c78b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 19 Apr 2016 15:09:53 +0100 Subject: [PATCH] Update plugin docs for restarts --- site/plugin.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/plugin.md b/site/plugin.md index de31d347..f518557f 100644 --- a/site/plugin.md +++ b/site/plugin.md @@ -54,11 +54,11 @@ then run your containers using the Docker command-line: ### Restarting the Plugin -The plugin is started with a policy of `--restart=always`, so that it is always there after a restart or reboot. If you remove this container (for example, when using `weave reset`) before removing all endpoints created using `--net=weave`, Docker may hang for a long time when it subsequently tries to re-establish communications to the plugin. +The plugin, like all Weave Net components, is started with a policy of `--restart=always`, so that it is always there after a restart or reboot. If you remove this container (for example, when using `weave reset`) before removing all endpoints created using `--net=weave`, Docker may hang for a long time when it subsequently tries to re-establish communications to the plugin. Unfortunately, [Docker 1.9 may also try to communicate with the plugin before it has even started it](https://github.com/docker/libnetwork/issues/813). -If you are using `systemd`, it is advised that you modify the Docker unit to remove the timeout on startup. This gives Docker enough time to abandon its attempts. For example, in the file `/lib/systemd/system/docker.service`, add the following under `[Service]`: +If you are using `systemd` with Docker 1.9, it is advised that you modify the Docker unit to remove the timeout on startup. This gives Docker enough time to abandon its attempts. For example, in the file `/lib/systemd/system/docker.service`, add the following under `[Service]`: TimeoutStartSec=0