Matthias Radestock
a3db33cfd9
more helpful error message when weave et al die on startup
...
Closes #958 .
2015-06-17 22:54:11 +01:00
Matthias Radestock
501108e3ae
cosmetic: vertical alignment
2015-06-17 15:13:07 +01:00
Matthias Radestock
87fe10ab5d
Merge pull request #952 from paulbellamy/950-proxy-launch-router
...
Add support for WEAVE_CIDR=none
Fixes #950 .
2015-06-17 14:57:35 +01:00
Paul Bellamy
6c26a55b5a
[proxy] refactor weaveCIDRsFromConfig slightly
2015-06-17 14:51:12 +01:00
Paul Bellamy
ca681bce13
[proxy] Add support for WEAVE_CIDR=none
...
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
2015-06-17 14:51:12 +01:00
Bryan Boreham
ff838a14d9
Fix terminology in error message.
...
Also removed hint on usage, because `-iprange` is on by default.
2015-06-17 13:16:53 +01:00
Matthias Radestock
c45b586a44
Merge pull request #949 from paulbellamy/939-proxy-env-bug
...
remove spurious output from proxy-(env|config)
Fixes #939 .
2015-06-17 12:10:09 +01:00
Matthias Radestock
215312bb5f
Merge pull request #946 from bboreham/758-expand-ipam-docs
...
Expand description of -initpeercount in docs
Closes #758 .
2015-06-17 12:06:04 +01:00
Bryan Boreham
34e0e3bb24
Merge pull request #935 from bboreham/weavedns-races
...
All unit and smoke tests passed.
2015-06-17 12:05:43 +01:00
Paul Bellamy
b1f43f0d7c
[proxy] Remove spurious output from proxy-(env|config)
...
`docker log` outputs an error if stdout is closed before it is done, so
silence that
2015-06-17 11:53:28 +01:00
Bryan Boreham
40efc347b6
Cosmetic
2015-06-17 11:41:46 +01:00
Matthias Radestock
71f19469ab
Merge pull request #947 from paulbellamy/940-proxy-default-ipam
...
[proxy] --with-ipam -> --no-default-ipam
Closes #940 .
2015-06-17 11:37:25 +01:00
Bryan Boreham
9636675c2c
Split part of DNSServer.Start() to a separate ActivateAndServe()
...
Specifically, move the part that blocks, and call that as necessary.
This means Start() can run on the caller's goroutine and avoid race conditions.
2015-06-17 11:35:53 +01:00
Bryan Boreham
1b57a24789
Don't re-initialise log writers unless the type changed.
...
This avoids race-conditions in unit tests where the initialisation
is on a different goroutine to the logging.
2015-06-17 11:35:01 +01:00
Bryan Boreham
90fb201a51
Copy the DNS entry going into the cache, to avoid races.
...
The shuffleAnswers() call ends up acting on the same data,
so it seems simplest to resolve ownership arguments by copying.
2015-06-17 11:35:01 +01:00
Bryan Boreham
657133db50
Move the counting of results from DNS goroutine to test goroutine to avoid race-condition
2015-06-17 11:35:01 +01:00
Bryan Boreham
e68364cb3b
Don't overwrite recvChan; it just creates a race condition
2015-06-17 11:35:01 +01:00
Bryan Boreham
1f92ae6ba8
Swap the order in which two goroutines are started, since one relies on the other.
2015-06-17 11:35:01 +01:00
Bryan Boreham
a6bebd85ed
Remove 'running' member that triggers a race warning and isn't necessary.
2015-06-17 11:35:01 +01:00
Paul Bellamy
220c80c3ed
[proxy] --with-ipam -> --no-default-ipam
2015-06-17 11:31:33 +01:00
Bryan Boreham
5960ecb3d1
Expand description of -initpeercount
2015-06-17 11:12:10 +01:00
Matthias Radestock
c2778d9fa3
improve -neg-ttl usage message
2015-06-17 10:29:39 +01:00
Matthias Radestock
cfe14ff568
Merge pull request #943 from inercia/weave-941
...
make negative TTL default to same value as TTL
Fixes #941 .
2015-06-17 10:23:41 +01:00
Matthias Radestock
cf5d8874b6
Merge pull request #937 from inercia/weave-934
...
Ignore empty queries (sent when the server is being shut down)
Fixes #934 .
2015-06-17 10:10:18 +01:00
Alvaro Saurin
d086867c0c
make negative TTL default to same value as TTL
2015-06-17 10:17:12 +02:00
Matthias Radestock
d09133c010
cosmetic: less sudoing
2015-06-17 08:30:35 +01:00
Matthias Radestock
6ac2b34a6e
Merge pull request #936 from weaveworks/readme_update_2
...
Update wget to curl
2015-06-17 08:27:46 +01:00
Matthias Radestock
9276df62c2
document weave stop-proxy
2015-06-17 07:09:47 +01:00
Matthias Radestock
d4c383b4b7
cosmetic: add weaveDNS TTL customisation to ToC
2015-06-17 07:05:09 +01:00
Matthias Radestock
b10a4a2976
cosmetic
2015-06-17 06:59:20 +01:00
Matthias Radestock
cfda9ffb8f
add load balancing and faul resilience to weaveDNS docs ToC
...
This was missed in #775
2015-06-17 06:48:12 +01:00
Matthias Radestock
ae5c2dab86
take advantage of recent features in proxy example
2015-06-16 23:01:14 +01:00
Matthias Radestock
0452076ebc
remove outdated note
2015-06-16 22:58:30 +01:00
Matthias Radestock
7831460eff
rely on ipam for launch-dns in proxy example
2015-06-16 22:51:57 +01:00
Matthias Radestock
20d5790358
drop -iprange from proxy docs, since ipam is enabled by default now
2015-06-16 22:51:10 +01:00
Matthias Radestock
a52702f76e
fix typo
2015-06-16 22:46:41 +01:00
Matthias Radestock
351573c122
simplify proxy launch examples
...
No need to specify --with-dns if DNS is running.
This should have been changed as part of #898 .
2015-06-16 22:38:53 +01:00
Matthias Radestock
809b048abd
fix sporadic 650_*.sh test failure caused by undefined variable
...
This is quite hilarious...
$BASE_IMAGE is not defined in config.sh. So running this test would
actually attempt to run something like
docker -H=... run -e WEAVE_CIDR=10.2.1.4/24 grep ^1$ /sys/class/net/ethwe/carrier
i.e. it would try to run the 'grep' image.
So why does this not fail all the time?
1) 610_*.sh defines $BASE_IMAGE.
2) 620_*.sh builds a 'grep' image.
If either of these tests are included in the same test run before
650_*.sh, then the latter will succeed.
Throw in our fabulous CircleCI scheduler, which distributes tests
according to their execution time, and you end up with sporadic
failures.
Fixes #938 .
2015-06-16 21:13:35 +01:00
Alvaro Saurin
c697d2a8f9
Ignore empty queries (sent when the server is being shut down)
2015-06-16 20:54:51 +02:00
Adam Harrison
b8afefa55f
Merge pull request #931 from paulbellamy/weavedns_default_search_domain
...
[dns] resolve names in `weave.local` by default unless hostname or search path is specified
2015-06-16 18:13:17 +01:00
Fintan Ryan
84bf3c139c
Update wget to curl
2015-06-16 17:55:48 +01:00
Paul Bellamy
1bd343f9f0
Merge pull request #932 from bboreham/921-ipam-or-die
...
Kill the container we just started if we fail to allocate an IP address
2015-06-16 16:18:23 +01:00
Bryan Boreham
fd5ac633d3
Use weave attach --or-die in proxy instead of killing it in the proxy.
2015-06-16 16:05:41 +01:00
Paul Bellamy
a3e836bbaf
Merge pull request #933 from inercia/weave-930
...
Use read/write-locks instead of read-locks in the Domain*Lookup()
2015-06-16 15:41:44 +01:00
Bryan Boreham
ee4daf02b5
Introduce ipam_cidrs_or_die, and call it where we don't want the
...
container to survive an ipam failure.
2015-06-16 15:27:49 +01:00
Paul Bellamy
a8c1832469
updating docs for new dns-search domain behaviour
2015-06-16 15:13:19 +01:00
Paul Bellamy
2c3baa9119
use weavedns search-domain by default
...
iff no hostname/dns-search specified
2015-06-16 15:13:19 +01:00
Alvaro Saurin
f4507e7252
Change read-locks for read/write-locks
2015-06-16 16:02:49 +02:00
Bryan Boreham
32d3909023
Make ipam_cidrs() return failure when call_weave fails
2015-06-16 14:47:47 +01:00
Alvaro Saurin
8a935e3cb2
Launch WeaveDNS with "launch_dns_on"
2015-06-16 15:29:36 +02:00
Matthias Radestock