Move sleep on reset from IPAM Allocator to weave script

This commit is contained in:
Bryan Boreham committed 2016-05-10 16:03:08 +01:00
1 parent c434345960
commit 16b75f899e
2 files changed
+1 -1

No files matched your search

-1
View File
@@ -419,7 +419,6 @@ func (alloc *Allocator) Shutdown() {
alloc.persistRing()
alloc.space.Clear()
alloc.gossip.GossipBroadcast(alloc.Gossip())
time.Sleep(100 * time.Millisecond)
}
doneChan <- struct{}{}
}
+1
View File
@@ -2308,6 +2308,7 @@ EOF
plugin_disabled || util_op remove-plugin-network weave || warn_plugin_active
warn_if_stopping_proxy_in_env
call_weave DELETE /peer >/dev/null 2>&1 || true
fractional_sleep 0.5 # Allow some time for broadcast updates to go out
for NAME in $PLUGIN_CONTAINER_NAME $CONTAINER_NAME $PROXY_CONTAINER_NAME ; do
docker stop $NAME >/dev/null 2>&1 || true
docker rm -f $NAME >/dev/null 2>&1 || true