Paul Bellamy
34bb7ae84a
[circle] use new gce templates for docker 1.7.1
2015-07-27 12:51:12 +01:00
Matthias Radestock
aa4efd63ef
cosmetic: uncomment test the way ordained by emacs
2015-07-22 16:55:43 +01:00
Tom Wilkie
a12d63bb12
Make ipam test less stressful, so it doesn't timeout.
2015-07-22 12:53:27 +00:00
Tom Wilkie
062a25a032
Make unit test timeout 8mins.
2015-07-22 12:19:12 +00:00
Tom Wilkie
9e6d08c606
Put 2m timeout on all unit tests.
2015-07-22 11:56:39 +00:00
Alvaro
976641c3b6
Reverted: Fixed typo
2015-07-22 12:17:29 +02:00
Alvaro
2f80f12001
Fixed typo
2015-07-22 12:14:38 +02:00
David Wragg
26dc83dbc2
Merge weaveworks/519_remove_outermost_gob (PR #1189 )
2015-07-21 12:01:40 +01:00
Matthias Radestock
3c107d675a
Merge branch '1.0'
2015-07-21 11:42:49 +01:00
Matthias Radestock
a20ca49344
Merge pull request #1206 from weaveworks/1201-weavewait-ro
...
[proxy] Mount weavewait readonly so it can't be tampered with
Fixes #1201 .
2015-07-21 11:41:48 +01:00
Paul Bellamy
aa8466f688
[proxy] Mount weavewait readonly so it can't be tampered with
2015-07-21 11:30:56 +01:00
Tom Wilkie
2980586e76
Put timeout on nameserver test to try and expose #1203
2015-07-21 09:25:04 +00:00
Paul Bellamy
dba116bae1
Merge remote-tracking branch 'upstream/1.0'
2015-07-21 10:13:24 +01:00
Matthias Radestock
0b7d462adf
enforce a message size limit
...
so we do not allocate loads of memory when receiving (accidental or
deliberate) garbage
2015-07-20 23:51:04 +01:00
Matthias Radestock
6f8622a1a0
replace outermost framing on tcp connection
...
switch from gob to length-prefix encoding
2015-07-20 23:51:04 +01:00
Matthias Radestock
af049efb40
refactor: s/SimpleTCP{Sender,Receiver}/GobTCP{Sender,Receiver}
2015-07-20 23:51:02 +01:00
Matthias Radestock
ad4e4ce6b8
refactor: make 'inner' encoder/decoder explicit
2015-07-20 23:50:10 +01:00
Tom Wilkie
4c9b0be117
Merge pull request #1198 from weaveworks/1146-coverage
...
When running unit tests, output coverage for imported modules.
2015-07-20 20:34:12 +01:00
Tom Wilkie
a9dae46110
When running unit tests, output coverage for imported modules.
2015-07-20 15:47:07 +00:00
Paul Bellamy
53628fdeff
Merge pull request #1187 from weaveworks/1182-proxy-tls-close
...
[proxy] Fully close TLS sockets, as they have no CloseWrite
2015-07-20 16:46:21 +01:00
Bryan Boreham
e34093c328
Merge pull request #1197 from weaveworks/1158-flaky
...
LGTM
2015-07-20 16:02:52 +01:00
Tom Wilkie
9131b46263
Flush gossip messages after each turn, to ensure there isn't a build up of pending messages.
2015-07-20 14:36:40 +00:00
Michael Bridgen
2a9c3fc64a
Merge branch 'pr1112'
2015-07-20 15:31:42 +01:00
Michael Bridgen
c44c61dc83
Merge branch '1103-proxy-chunking' of github.com:weaveworks/weave into pr1112
2015-07-20 15:09:50 +01:00
Paul Bellamy
11663dd29f
[proxy] rewrote chunked response handler
...
1) We cannot send "Connection: close", because the fsouza docker client
expects the tcp socket to stay open between requests.
2) Because we cannot force-close the connection, we can't hijack the
connection (because go's net/http doesn't let use un-hijack it).
3) Because we need to maintain the individual chunking of messages (for
docker-py), we can't just copy the response body, as Go will remove and
re-add the chunking willy-nilly.
Therefore, we have to read each chunk one-by-one, and flush the
ResponseWriter after each one.
2015-07-20 14:43:16 +01:00
Bryan Boreham
90b7c3625d
Merge pull request #1176 from weaveworks/1156-gossip-timestamp
...
LGTM
2015-07-20 14:28:01 +01:00
Tom Wilkie
4e29dba5cd
Make Gossip DNS reject gossip messages if clockskew > tombstoneTimeout / 2
2015-07-20 13:12:07 +00:00
Matthias Radestock
f1b5a00cb3
Merge pull request #1195 from weaveworks/1177-dns-disappear
...
Don't periodically delete all non-tombstone entries.
Fixes #1177 .
2015-07-20 13:07:42 +01:00
Tom Wilkie
1a4b38a10c
Don't delete all the non-tombstone entries every 10mins!
2015-07-20 12:03:46 +00:00
Tom Wilkie
9ab2da8deb
Add GET /name handler to return all dns entries (including tombstones) for debugging.
...
Also, make Address marshall into json as an IP string, not a number.
2015-07-20 12:03:33 +00:00
Matthias Radestock
66473e6021
refactor: return slice instead of pointer to slice from tombstone()
2015-07-20 12:37:54 +01:00
Paul Bellamy
a9229b9197
weave env should still work with '--log-level=debug'
2015-07-20 11:57:20 +01:00
Paul Bellamy
7b9e59833e
test upload_executable helper should mkdir before uploading
2015-07-20 10:58:39 +01:00
Tom Wilkie
5baddb83cb
Comment out failing test until we figure out what to do.
2015-07-20 09:45:02 +00:00
Tom Wilkie
4e56247ed9
Merge pull request #1193 from weaveworks/disable_dns_in_multiweave
...
Disable dns in multiweave
2015-07-20 10:41:56 +01:00
Matthias Radestock
ae2348875b
disable dns in multiweave
...
Thus unbreaking it post #1065 .
2015-07-19 22:52:42 +01:00
Matthias Radestock
fafaeef07d
introduce --no-dns option
...
undocumented, since it is mainly meant for testing
2015-07-19 22:51:40 +01:00
Matthias Radestock
5b62b8c1e3
refactor: inline populate_dns
...
and ditch the wait_for_status, since we've only just called that
2015-07-19 22:32:33 +01:00
Matthias Radestock
7c17c8aec3
refactor: simplify router arg parsing
...
using the same "always shift one" approach as in proxy_args
2015-07-19 21:56:04 +01:00
Matthias Radestock
64408b126e
weave launch-router wasn't returning the correct container id
...
since $CONTAINER gets stomped on by various functions, in particular
populate_dns.
Broken by #1065 .
2015-07-19 21:50:45 +01:00
Bryan Boreham
2a1f090a88
Merge pull request #1183 from weaveworks/1181-data-race
...
Correctly stop the test gossip router to prevent complaints of data races in subsequent tests.
2015-07-17 17:14:46 +01:00
Matthias Radestock
e2a2a8f18f
Merge branch '1.0'
2015-07-17 15:07:45 +01:00
Matthias Radestock
dafa30725e
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-17 15:07:19 +01:00
Matthias Radestock
24b9a56e0a
Merge pull request #1172 from weaveworks/issues/1061-improve-blockquote
...
Use Boostrap styles for warnings in docs
Fixes #1061 .
2015-07-17 15:06:40 +01:00
Tom Wilkie
a3d32068d2
Correctly stop the test gossip router to prevent complaints of data races in subsequent tests.
2015-07-17 13:48:39 +00:00
David Kaltschmidt
e7f6682593
Use bootstrap alert styles for blockquote
2015-07-17 15:14:29 +02:00
Paul Bellamy
3f4b385b0f
[proxy] If we can't CloseWrite a connection (tls), just Close it so clients don't hang
2015-07-17 14:09:27 +01:00
Paul Bellamy
5fc16a8267
[proxy] use a waitgroup as it's more semantically accurate
2015-07-17 14:08:51 +01:00
Bryan Boreham
68afbe31b0
Shrink image file size
2015-07-17 14:07:23 +01:00
Tom Wilkie
ba3451e9ca
Merge pull request #1180 from weaveworks/1171-210-failures
...
Don't swallow errors in the docker client.
2015-07-17 13:38:38 +01:00
Paul Bellamy