reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1155 from weaveworks/dns-gossip

Browse Source 
Make DNS gossip converge correctly

Fixes #1151
This commit is contained in:
Matthias Radestock committed 2015-07-15 20:37:43 +01:00
2 parents 4d887c8a55 73210b6a70
commit 23ad547db4
5 files changed
+74 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/210_dns_cross_hosts_test.sh
+18 -2
View File
@@ -12,14 +12,30 @@ NAME4=seefour.weave.local
start_suite "Resolve names across hosts"
weave_on $HOST1 launch --ipalloc-range $UNIVERSE
weave_on $HOST2 launch --ipalloc-range $UNIVERSE $HOST1
for host in $HOSTS; do
weave_on $host launch --ipalloc-range $UNIVERSE $HOSTS
done
# Basic test
start_container $HOST2 $C2/24 --name=c2 -h $NAME2
start_container_with_dns $HOST1 $C1/24 --name=c1
assert_dns_record $HOST1 c1 $NAME2 $C2
# 2 containers on each host, all with the same names
FOO_IPS=
for host in $HOSTS; do
CID=$(proxy docker_on $host run -dti --name=foo $SMALL_IMAGE /bin/sh)
FOO_IPS="$FOO_IPS $(container_ip $host foo)"
CID=$(proxy docker_on $host run -dti --name=bar $SMALL_IMAGE /bin/sh)
BAR_IPS="$BAR_IPS $(container_ip $host bar)"
done
start_container_with_dns $HOST1 --name=baz
assert_dns_record $HOST1 baz foo.weave.local $FOO_IPS
assert_dns_record $HOST1 baz bar.weave.local $BAR_IPS
# resolution for names mapped to multiple addresses
weave_on $HOST2 dns-add $C2a c2 -h $NAME2
weave_on $HOST2 dns-add $C2b c2 -h $NAME2