Tom Wilkie
aafa0f6783
Merge pull request #1338 from weaveworks/1336-check-len
...
In ipam ring unit test, check if we have any peers with entries to avoid crash
2015-08-20 12:15:27 +01:00
Bryan Boreham
df5426dd8b
Check if we have any peers with entries, to avoid crash
2015-08-20 11:57:56 +01:00
Adam Harrison
3803d79835
Merge pull request #1335 from weaveworks/1328_handle_invalid_status_sub_command
...
better error handling for invalid `weave status` sub-command
2015-08-20 11:48:01 +01:00
Matthias Radestock
ceff3bed28
better error handling for invalid weave status sub-command
...
instead of showing '404 page not found'
Fixes #1328 .
2015-08-20 11:14:59 +01:00
Matthias Radestock
eebdbe226b
Merge pull request #1325 from weaveworks/1322_handle_usage_locally
...
deal with `weave --help|help` locally
Fixes #1322 .
2015-08-20 10:13:45 +01:00
Matthias Radestock
8ab639ddaa
deal with weave --help|help locally
...
thus making them unaffected by docker breakages
Fixes #1322 .
2015-08-20 10:03:21 +01:00
Matthias Radestock
812579a139
Merge pull request #1326 from weaveworks/576_better_version_check
...
better docker version check
Fixes #576 .
2015-08-19 21:31:43 +01:00
Matthias Radestock
08f31886d6
better docker version check
...
Fixes #567 . Supersedes #1298 .
2015-08-19 21:20:14 +01:00
Matthias Radestock
f080e5aa5c
Merge pull request #1331 from weaveworks/clarify-test-160
...
clarify test 160
2015-08-19 20:41:59 +01:00
Matthias Radestock
d61c719e45
cosmetic
2015-08-19 20:39:16 +01:00
Bryan Boreham
4d49bf3ab9
Add comment to clarify the reason why there is no explicit 'assert' test at the end.
2015-08-19 16:54:24 +01:00
Matthias Radestock
f34f837106
Merge branch '1.0'
...
Conflicts:
weave
2015-08-19 16:38:55 +01:00
Matthias Radestock
1326994a6d
Merge pull request #1319 from weaveworks/dns-tcp
...
Expose dns server on tcp as well as udp
Fixes #1333 .
2015-08-19 16:34:09 +01:00
Matthias Radestock
99ab0d3abc
Merge branch '1.0'
2015-08-19 11:29:23 +01:00
Matthias Radestock
e61f9afb72
Merge pull request #1330 from weaveworks/1329_plug_gossip_sender_leak
...
plug GossipSender leak
Fixes #1329 .
2015-08-19 11:26:25 +01:00
Matthias Radestock
29c64b1f40
document weave env --restore
...
leftover from #1327
2015-08-19 11:20:10 +01:00
Bryan Boreham
db51b772b4
Merge pull request #1327 from weaveworks/1288_restore_env
...
Closes #1288
2015-08-19 10:54:43 +01:00
Matthias Radestock
0b764a2a27
plug GossipSender leak
...
GossipChannel.sendDown is the (only) place which creates
GossipSenders. It has two call sites, Send and SendDown, only the
former of which performed a gc of existing senders. Therefore, in
configurations with
- a lot of connection churn, and
- SendDown invocations for these connections, and
- few or no Send invocations
we can leak GossipSenders.
The most likely scenario for this to occur is a peer that, while
having no other connections, is making/accepting connections which get
torn down post handshake, e.g. because IPAM detected a clash.
Fixes #1329 .
2015-08-19 10:22:11 +01:00
Matthias Radestock
a93a3e98b9
warn when stopping proxy when the env is using it
2015-08-18 18:08:02 +01:00
Matthias Radestock
be94dcc8a3
introduce weave env --restore
...
`weave env` stashes the existing DOCKER_HOST in ORIG_DOCKER_HOST, and
`weave env --restore` sets DOCKER_HOST to $ORIG_DOCKER_HOST.
Closes #1288 .
2015-08-18 17:20:21 +01:00
Matthias Radestock
a34b31ad12
refactor: make proxy_addr more single purpose
2015-08-18 15:40:58 +01:00
Matthias Radestock
e1d07aa264
cosmetic
2015-08-18 15:34:43 +01:00
Matthias Radestock
0d79a8fc43
cosmetic
2015-08-18 15:08:59 +01:00
Matthias Radestock
5d1411830b
Merge branch '1.0'
2015-08-18 13:33:36 +01:00
Matthias Radestock
dc91ce9ec6
Merge branch 'latest_release_doc_updates' into 1.0
2015-08-18 13:33:15 +01:00
Matthias Radestock
36a857f343
remove "Contact information" link on docs home page
...
It's broken, and we have a link in the footer anyway.
Fixes #1260 .
2015-08-18 13:31:28 +01:00
Matthias Radestock
c1c5450caf
more idiomatic logger initialisation, with standard default log level
2015-08-18 12:04:48 +01:00
Bryan Boreham
0b4e8b8754
Merge pull request #1318 from weaveworks/1305_suppress_self_reconnection
...
lgtm. Fixes #1305 .
2015-08-18 11:14:15 +01:00
Matthias Radestock
f73dcba306
eliminate spurious warning when --ipalloc-range=""
...
Fixes #1320 .
2015-08-18 09:50:42 +01:00
Ilya Dmitrichenko
147a537b82
We are not using gcloud, but it cause a conflict
...
https://s3.amazonaws.com/archive.travis-ci.org/jobs/76062893/log.txt
2015-08-18 09:47:37 +01:00
Ilya Dmitrichenko
a4844b8ee7
We are not using gcloud, but it cause a conflict
...
https://s3.amazonaws.com/archive.travis-ci.org/jobs/76062893/log.txt
2015-08-18 09:46:09 +01:00
Ilya Dmitrichenko
acde6cb0ee
We are not using gcloud, but it cause a conflict
...
https://s3.amazonaws.com/archive.travis-ci.org/jobs/76062893/log.txt
2015-08-18 09:40:03 +01:00
Paul Bellamy
b4e13215c7
expose dns server on tcp as well as udp
...
issue was discovered when testing scope with master vs 1.0 branches.
2015-08-18 09:35:53 +01:00
Matthias Radestock
4ecaa0f508
don't put blank lines around sub-status
...
not what I had in mind, and it breaks the tests
2015-08-18 09:00:01 +01:00
Matthias Radestock
86b7e4a6db
Merge branch '1.0'
2015-08-18 08:50:41 +01:00
Matthias Radestock
aa19028583
Merge branch 'latest_release_doc_updates' into 1.0
2015-08-18 08:50:19 +01:00
Matthias Radestock
a6e2296e0a
Merge branch '1.0' into latest_release_doc_updates
2015-08-18 08:49:31 +01:00
Matthias Radestock
8c5248da43
Add release 1.0.2
v1.0.2
2015-08-18 08:27:26 +01:00
Matthias Radestock
59859c4aed
clarify allocation subnet overlap failure
...
Closes #1317 .
2015-08-18 01:50:30 +01:00
Matthias Radestock
0e85783257
cosmetic: add blank lines around weave status output
...
Closes #1315 .
2015-08-18 01:38:51 +01:00
Matthias Radestock
d8e8cd6e51
don't reconnect to ourself
...
When we discover that a connection target address leads to ourself we
set the retry time to the zero time.Time value - the only special
time.Time value. We use that marker to a) suppress subsequent
connection attempts, and b) display the next retry as 'never' in
`weave status|report`.
Closes #1305 .
2015-08-18 00:51:33 +01:00
Matthias Radestock
bbc91c1273
Merge pull request #1307 from weaveworks/1306-dns-recurse-compress
...
Compress recursive answers if they are too big.
Fixes #1306 .
2015-08-17 19:23:46 +01:00
Tom Wilkie
67f974923b
Test for recursive DNS queries & compression.
...
Note this doesn't test the golang resolver, where the original error
was found, as I can't find a way to point the golang resolver at a
custom dns server during a test. It does check that a compressed
response from an upstream server is correctly handled.
2015-08-17 18:25:36 +01:00
Tom Wilkie
4f00dab4c4
Compress recursive answers if they are too big.
2015-08-17 18:25:26 +01:00
Matthias Radestock
74e29c8990
Merge branch '1.0'
...
Conflicts:
nameserver/server.go
nameserver/server_test.go
2015-08-17 18:10:56 +01:00
Matthias Radestock
7fb597a8bf
Merge pull request #1313 from weaveworks/issues/1306-dns-compress-1-0-2
...
Try to compress too long replies (when forwarding).
Fixes #1306 .
2015-08-17 18:05:04 +01:00
Alvaro Saurin
c50c90ea8d
Try to compress too long replies (when forwarding).
2015-08-17 18:50:16 +02:00
Paul Bellamy
74883c5da8
Merge pull request #1310 from weaveworks/improve_proxy_ignore_messages
...
Improve log messages for when the proxy ignores a container
2015-08-17 16:27:45 +01:00
Matthias Radestock
375af0a7b9
Improve log messages for when the proxy ignores a container
...
- 'ignoring' could be misread as 'dropped request', so change that to
'leaving container alone'
- more elaborate reasons
2015-08-17 16:15:45 +01:00
Matthias Radestock
8c9679b19c
Merge branch '1.0'
...
Conflicts:
circle.yml
2015-08-17 15:01:44 +01:00