Matthias Radestock
cba1827d2c
Merge pull request #918 from bboreham/916-check-call-weave
...
Output error message if http call to weave or weavedns fails
Fixes #916 .
2015-06-15 21:16:40 +01:00
Matthias Radestock
3d7c18ee70
cosmetic: remove some unnecessary quoting
2015-06-15 21:02:23 +01:00
Matthias Radestock
82c1a58e81
refactor: remove unused weave dns-domain command
...
and inline dns_domain() function.
Both were introduced in #890 .
2015-06-15 19:23:52 +01:00
Matthias Radestock
8ac98f9f6b
tiny refactor: replace some 'if's with short-circuit expressions
2015-06-15 18:33:29 +01:00
Bryan Boreham
56e0636b14
Output error message if http call to weave or weavedns fails
2015-06-15 17:58:59 +01:00
Bryan Boreham
6534cc6ae3
Merge pull request #919 from bboreham/915-not-again-again
...
Fixes #915
2015-06-15 17:06:30 +01:00
Bryan Boreham
d25d0810af
Extend the 'block' flag to block allocateAgain()
...
otherwise we can re-insert the entry into the map after a parallel
allocateAgain() has cleared the flag. And it /that/ happens in
parallel with a free() then the data-structure can get out of sync.
2015-06-15 16:51:27 +01:00
Alvaro Saurin
ba2f6671a6
Removed a couple of Debug.Printf()s
2015-06-15 17:11:27 +02:00
Alvaro
9284366a3d
Merge pull request #917 from bboreham/inercia-flush-sched-queue
...
Return of the Fix for the zone refresh unit test
2015-06-15 15:45:57 +02:00
Bryan Boreham
7e6a478283
Merge pull request #914 from rade/911_different_gossip_channels
...
LGTM. Fixes #911
2015-06-15 14:42:22 +01:00
Matthias Radestock
e15ebd9118
add unit test for SurrogateGossiper
2015-06-15 14:22:25 +01:00
Bryan Boreham
0ff311356d
Flush the background updater goroutines to make tests reliable
2015-06-15 13:48:54 +01:00
Bryan Boreham
e49a29197b
Add a Flush() routine to synchronize callers
2015-06-15 13:48:24 +01:00
Bryan Boreham
2b7fb699af
Clean up a couple of compilation errors
2015-06-15 13:47:01 +01:00
Bryan Boreham
f3ad8bd52f
Merge branch 'weave-fix-unittest' of https://github.com/inercia/weave into inercia-weave-fix-unittest
2015-06-15 11:51:14 +01:00
Matthias Radestock
36ba838f54
remove ipam.DummyAllocator and rely on new SurrogateGossiper
...
As a result it is possible to mix nodes with and without IPAM. Note
that the quorum only involves the former, and hence such mixed
environments will typically require a custom `-initpeercount`.
2015-06-15 11:24:07 +01:00
Matthias Radestock
dea5bd0639
introduce SurrogateGossiper for dealing with unknown gossip channels
...
Instead of erroring when we receive gossip for an unknown channel, we
create a GossipChannel on the fly, with a SurrogateGossiper singleton
as the gossiper.
The SurrogateGossiper ignores unicasts and relays broadcasts and
gossip.
2015-06-15 11:23:32 +01:00
Matthias Radestock
0b3584a355
permit encoding of GossipData into multiple messages
2015-06-15 11:14:24 +01:00
Matthias Radestock
94220f22b2
allow dynamic addition of gossip channels
2015-06-15 11:14:24 +01:00
Matthias Radestock
ec85da914a
simplify dns-add/remove arg checking
2015-06-15 10:34:59 +01:00
Matthias Radestock
bfebfecf6c
refactor: simplify test router creation
2015-06-15 08:12:35 +01:00
Matthias Radestock
e48ec6a35f
clean up erroneous comment
2015-06-15 08:03:02 +01:00
Matthias Radestock
a844797d67
cosmetic: reduce test noise
2015-06-14 17:48:21 +01:00
Matthias Radestock
72640f1828
refactor: extract helpers for http calls into weave and weavedns
2015-06-14 17:46:56 +01:00
Matthias Radestock
4ce6a76d1f
remove outdated piece of docs
2015-06-14 16:36:37 +01:00
Matthias Radestock
bf4c75b1cd
don't validate -iprange value
...
We generally don't validate arguments in the script unless we process
them there.
2015-06-14 16:12:53 +01:00
Matthias Radestock
313a95a467
let -iprange "" start the router w/o IPAM
2015-06-14 16:06:20 +01:00
Matthias Radestock
926c85c6ba
more idiomatic 'boolean' in shell
2015-06-14 15:48:08 +01:00
Matthias Radestock
afb31d3beb
cosmetic: remove unused method
2015-06-14 11:49:03 +01:00
Matthias Radestock
c4c5ec1e92
refactor: add a little helper to improve abstraction
2015-06-14 11:09:55 +01:00
Matthias Radestock
cea85eb05b
cosmetic: move GossipChannel code into separate file
2015-06-14 10:35:51 +01:00
Matthias Radestock
3e0d0a1993
refactor: introduce NewGossipChannel
2015-06-14 10:09:36 +01:00
Matthias Radestock
882ed85d77
tiny refactor
2015-06-14 09:37:13 +01:00
Matthias Radestock
eae9928e98
don't complain when weave --local run is invoked without args
...
leave that to docker, same as we do for `weave run`
Fixes #910 .
2015-06-13 00:48:01 +01:00
Matthias Radestock
779d1589c5
Merge pull request #907 from bboreham/819-check-its-alive
...
Free allocated address if container is not running
Fixes #819 .
2015-06-12 17:22:16 +01:00
Bryan Boreham
4c01af4e1d
Check if container is still running right after allocating
2015-06-12 17:09:11 +01:00
Bryan Boreham
13944f3811
Refactor is-running check so we can re-use more of the code
2015-06-12 17:09:11 +01:00
Matthias Radestock
0f9f1feb87
Merge pull request #906 from awh/weavedns_restrict_http_listen
...
DNS HTTP API listens on eth0 only
Fixes #899 .
2015-06-12 16:56:22 +01:00
Adam Harrison
b6889ec8c3
DNS HTTP API listens on eth0 only
2015-06-12 16:55:27 +01:00
Bryan Boreham
5aafbbeff0
Fix compile error introduced in merge of #904
2015-06-12 16:20:35 +01:00
Matthias Radestock
7462fe91d5
Merge pull request #904 from bboreham/inercia-weave-821
...
Remove stale records for short-lived containers (bis)
Fixes #821 . Replaces and hence closes #865 .
2015-06-12 15:36:12 +01:00
Matthias Radestock
79c5343ca5
Merge pull request #905 from bboreham/slashten
...
Use /10 instead of /9 for default iprange
Patching up #893 .
2015-06-12 15:21:38 +01:00
Matthias Radestock
d5ebd6a0c4
Merge branch 'latest_release_doc_updates'
...
Conflicts:
CHANGELOG.md
nameserver/cache_test.go
site/features.md
site/proxy.md
weave
2015-06-12 15:16:50 +01:00
Bryan Boreham
12de13c678
Use /10 instead of /9 for default iprange, so it doesn't clash with CircleCI address
2015-06-12 15:15:36 +01:00
Matthias Radestock
97d692df80
don't restart docker in test setup
...
due to that leaving container debris behind that docker takes ages to
clean up.
2015-06-12 15:01:35 +01:00
Bryan Boreham
7941612dad
remove one level of indentation
2015-06-12 15:01:06 +01:00
Matthias Radestock
c25706f6a5
Merge pull request #902 from bboreham/885-gossip-race
...
Keep flushing gossip until it's all gone
A better (i.e. working?) fix for #885 .
2015-06-12 15:00:02 +01:00
Bryan Boreham
799e202d6d
Make error message more readable
2015-06-12 14:52:20 +01:00
Bryan Boreham
658fbac7aa
Keep flushing gossip until it's all gone
...
A better (i.e. working?) fix for #885 .
2015-06-12 14:50:37 +01:00
Bryan Boreham
086daca3d0
Fold communication-checking code into docker.Client.NewClient()
2015-06-12 14:45:29 +01:00
Matthias Radestock