Merge pull request #1518 from weaveworks/401-reattach-weave2
Get proxy to re-attach weave router if it restarts
This commit is contained in:
commit
c5f5d4543e
4 files changed
+61
-10
No files matched your search
@@ -13,28 +13,32 @@ check_attached() {
|
||||
|
||||
start_suite "Proxy restart reattaches networking to containers"
|
||||
|
||||
weave_on $HOST1 launch
|
||||
WEAVE_DOCKER_ARGS=--restart=always WEAVEPROXY_DOCKER_ARGS=--restart=always weave_on $HOST1 launch
|
||||
proxy_start_container $HOST1 -e WEAVE_CIDR=$C2/24 -di --name=c2 --restart=always -h $NAME
|
||||
proxy_start_container_with_dns $HOST1 -e WEAVE_CIDR=$C1/24 -di --name=c1 --restart=always
|
||||
|
||||
proxy docker_on $HOST1 restart -t=1 c2
|
||||
check_attached
|
||||
|
||||
# Restart weave router
|
||||
docker_on $HOST1 restart weave
|
||||
sleep 1
|
||||
check_attached
|
||||
|
||||
# Kill outside of Docker so Docker will restart it
|
||||
run_on $HOST1 sudo kill -KILL $(docker_on $HOST1 inspect --format='{{.State.Pid}}' c2)
|
||||
sleep 1
|
||||
check_attached
|
||||
|
||||
# Restart docker itself, using different commands for systemd- and upstart-managed.
|
||||
run_on $HOST1 sh -c "command -v systemctl >/dev/null && sudo systemctl restart docker || sudo service docker restart"
|
||||
sleep 5
|
||||
check_attached
|
||||
|
||||
# Restarting proxy shouldn't kill unattachable containers
|
||||
proxy_start_container $HOST1 -di --name=c3 --restart=always # Use ipam, so it won't be attachable w/o weave
|
||||
weave_on $HOST1 stop
|
||||
weave_on $HOST1 launch-proxy
|
||||
assert_raises "proxy exec_on $HOST1 c3 $CHECK_ETHWE_UP"
|
||||
|
||||
# Restart docker itself, using different commands for systemd- and upstart-managed.
|
||||
run_on $HOST1 sh -c "command -v systemctl >/dev/null && sudo systemctl restart docker || sudo service docker restart"
|
||||
sleep 1
|
||||
weave_on $HOST1 launch
|
||||
check_attached
|
||||
|
||||
end_suite
|
||||
Reference in new issue
Block a user