Matthias Radestock
2b61bc91df
cosmetic: remove blank log lines
2015-07-11 16:43:33 +01:00
Matthias Radestock
982c9d7650
remove dead code
2015-07-11 11:17:44 +01:00
Matthias Radestock
76943f0b17
cosmetic
2015-07-11 02:52:30 +01:00
Matthias Radestock
c4f516655d
refactor: simplify ipam claim try
2015-07-11 02:28:14 +01:00
Adam Harrison
da41604229
Fix IPAM test compilation
2015-07-10 15:43:28 +01:00
Adam Harrison
d5a4326b9e
Merge branch '1.0'
...
Conflicts:
ipam/allocator_test.go
ipam/claim.go
2015-07-10 14:35:41 +01:00
Bryan Boreham
cf4ce0a07d
Don't cancel address claim when caller closes socket
2015-07-09 10:47:34 +01:00
Bryan Boreham
78c4b06492
Don't wait for certainty before responding to Claim
...
Conflicts:
ipam/claim.go
2015-07-09 10:47:27 +01:00
Tom Wilkie
89ad7e1ba2
Move test gossip router out of ipam code for use in gossip dns code.
2015-07-08 15:03:13 +00:00
Alvaro
33921c2cfe
Merge pull request #1073 from weaveworks/971_check_container_alive_in_api
...
make container aliveness check part of the ipam & dns API
2015-07-07 16:08:40 +02:00
Tom Wilkie
4fdb14293b
Move ipam/address to net/address
2015-07-07 10:33:20 +00:00
Matthias Radestock
6596c8b1a7
make container aliveness check part of the ipam & dns API
...
...rather than conducting it implicitly when an ID "looks like" a
container ID.
Closes #971
2015-07-04 19:13:13 +01:00
Bryan Boreham
ff2d7451e2
Remove -debug option, superceded by --log-level
2015-07-04 03:27:07 +01:00
Matthias Radestock
bf73029d15
cosmetic: goimports -w .
2015-07-03 20:41:35 +01:00
Bryan Boreham
8c6c692926
Seed the math/rand generator from the time
2015-07-03 13:39:47 +01:00
Matthias Radestock
fcea6fcbf8
Merge branch '1.0'
2015-07-03 10:03:43 +01:00
Matthias Radestock
8b35f5e8fe
fix typo in comment
2015-07-03 10:03:07 +01:00
Bryan Boreham
a5ddb63fca
Remove Info.Print in favour of Log.Info
2015-07-01 14:01:45 +01:00
Bryan Boreham
d82578d895
Replace logging calls with new style
2015-07-01 12:26:23 +01:00
Matthias Radestock
8dd9020803
Merge branch '1.0'
...
Conflicts:
ipam/allocator_test.go
2015-06-26 14:08:09 +01:00
Bryan Boreham
c84c5dbcdf
Make TestGossipRouter goroutine easier to follow
2015-06-26 11:53:14 +01:00
Bryan Boreham
6725c8355f
Check the result of Allocate in TestFakeRouterSimple()
2015-06-26 11:53:03 +01:00
Bryan Boreham
c659e3448a
Add a flush() function to the mock gossip router, and call it where required
2015-06-26 11:40:58 +01:00
Bryan Boreham
959e5f0082
Use different object types for mock gossip messages
2015-06-26 11:38:25 +01:00
Bryan Boreham
6488b0d11c
More idiomatic exitChan
2015-06-26 11:38:07 +01:00
Matthias Radestock
39a6d1c87e
refactor: simplify a test
2015-06-25 20:13:03 +01:00
Matthias Radestock
ee2a66323e
Merge branch '1.0'
...
Conflicts:
ipam/ring/ring_test.go
2015-06-25 19:57:09 +01:00
Bryan Boreham
8a4b0d536e
Updated after review feedback
2015-06-25 15:41:06 +01:00
Bryan Boreham
c76f640e2e
Simpler implementation of weighted-random order
2015-06-25 14:54:44 +01:00
Bryan Boreham
b472da18f0
Improve logging of unicast gossip errors
2015-06-25 14:04:37 +01:00
Bryan Boreham
c58cc449c0
More complex ChoosePeersToAskForSpace, with better complexity
2015-06-25 13:19:49 +01:00
Bryan Boreham
af9668f130
Keep trying peers to ask for space until we find one that doesn't error
2015-06-25 12:47:38 +01:00
Bryan Boreham
9f784b3c31
Report errors in unicasting gossip
2015-06-25 12:22:53 +01:00
Paul Bellamy
cdee7a5d6f
Replacing custom testing helpers with testify, where possible
2015-06-17 16:58:03 +01:00
Paul Bellamy
21e07c0db9
Running gofmt -s
2015-06-17 15:32:08 +01:00
Paul Bellamy
06101d134b
Running goimports
2015-06-17 15:32:08 +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
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
0b3584a355
permit encoding of GossipData into multiple messages
2015-06-15 11:14:24 +01:00
Matthias Radestock
afb31d3beb
cosmetic: remove unused method
2015-06-14 11:49:03 +01:00
Matthias Radestock
882ed85d77
tiny refactor
2015-06-14 09:37:13 +01:00
Bryan Boreham
4c01af4e1d
Check if container is still running right after allocating
2015-06-12 17:09:11 +01:00
Bryan Boreham
36f793c1f4
Delete entry from addresses map when slice is empty
2015-06-10 17:27:07 +01:00
Bryan Boreham
c27cd5b4ab
Extract lookup function for owned addresses
2015-06-10 17:27:07 +01:00
Bryan Boreham
e9d194327a
Reduce level of noise in debug logs from containers dying
2015-06-10 17:24:36 +01:00
Bryan Boreham
a3d73be8b8
General tidying
...
tidy Address helper functions,
make ordering of members consistent in allocate and claim,
make linter happier,
remove some unused items, and
update some comments
2015-06-10 17:24:36 +01:00
Bryan Boreham
fa0b0042b2
Eradicate the last vestiges of CIDR in Allocator
2015-06-10 17:24:36 +01:00
Bryan Boreham
e21f66db0a
Use address.Range instead of (start,end) pairs
2015-06-10 17:24:36 +01:00
Bryan Boreham
a80e5cb028
Corrected space.Donate() to restrict the space donated to be in-range, and associated unit test changes
2015-06-10 17:24:36 +01:00