Bryan Boreham
09a6c2eda0
Get the owned ranges for test purposes via the actor loop, so we don't set off the race detector
2016-03-19 15:29:34 +00:00
Bryan Boreham
71ec252298
Merge pull request #2066 from weaveworks/2058-idempotent-rmpeer
...
make 'rmpeer' report on size of transferred range, and not fail
2016-03-19 15:10:58 +00:00
Matthias Radestock
9f10b21c9c
use Space.NumFreeAddresses for calculating transferred ip count
...
...rather than Space.NumFreeAddressesInRange; we don't care about the
universe.
Alternatively we could make Space.AddRanges return the count. But
AddRanges doesn't know whether the ranges overlap with existing free
space - that is only guaranteed by the context - so would have to do
much the same before/after calculation.
Another alternative would be to add the range sizes in
AdminTakeoverRanges. But that is more code and less clear.
2016-03-19 14:41:36 +00:00
Matthias Radestock
62d823850c
make rmpeer report on size of transferred space, and not fail
...
Closes #2058 .
2016-03-19 14:40:26 +00:00
Matthias Radestock
c48eefa82d
refactor(ish): extract allocator logging commonality
...
and add warnf
2016-03-19 14:32:54 +00:00
Matthias Radestock
65eff683dd
Merge branch '1.4'
2016-03-19 14:30:38 +00:00
Bryan Boreham
b1ec2b788a
Bump template name so it will fetch latest Docker
2016-03-19 14:12:17 +00:00
Matthias Radestock
f42e275884
broadcast ipam ring update after rmpeer
...
So that other peers notice the change more promptly.
Fixes #2068 .
2016-03-19 13:57:20 +00:00
Matthias Radestock
8ce6d3863e
Merge pull request #2067 from weaveworks/address-count
...
Add address.Count type
2016-03-19 12:04:02 +00:00
Bryan Boreham
f11314ed3e
Introduce 'Count' type to avoid abusing 'Offset'
2016-03-19 11:47:34 +00:00
Matthias Radestock
7b6364696c
Merge branch '1.4'
2016-03-18 19:29:59 +00:00
Matthias Radestock
5dfd104728
reduce docker event subscription retry max interval
2016-03-18 19:29:21 +00:00
Matthias Radestock
bc7539c4ad
cosmetic: consistency
2016-03-18 11:56:10 +00:00
Matthias Radestock
0474227d6e
Merge pull request #2062 from weaveworks/issues/2059-weave-ps-ignore-stopped
...
Protect container-addrs util_op against stopped containers
Fixes #2059 .
2016-03-18 11:13:14 +00:00
Adam Harrison
04bbb14f59
Propagate container-addrs util_op failure
2016-03-18 10:56:10 +00:00
Adam Harrison
f9f6e8ed26
Protect container-addrs against stopped containers
2016-03-18 10:46:30 +00:00
Matthias Radestock
9c2e9bab14
cosmetic(ish) refactor
2016-03-18 02:42:53 +00:00
Matthias Radestock
4539bde5f5
simplify weave consense explanation
2016-03-18 02:03:34 +00:00
Matthias Radestock
44db686ef3
don't mention the election
...
Fixes #2060 .
2016-03-18 01:56:52 +00:00
Matthias Radestock
221ef4adca
make a few more shell funs safe
...
...for calling in a context w/o 'set -e', even though right now they
always are.
Follow-on of #2054 .
2016-03-17 21:32:08 +00:00
Matthias Radestock
c1d4e34ed0
Merge pull request #2055 from weaveworks/cleanup_attach_router
...
Remove unnecessary netns change in attach_router
2016-03-17 20:50:03 +00:00
Bryan Boreham
4903c2b23c
Remove unnecessary netns switch for router in attach_router,
...
and improve the name of the function which sends existing
container data into the router
2016-03-17 20:32:41 +00:00
Matthias Radestock
cd9b7bfcda
Merge pull request #2054 from weaveworks/issues/2053-errexit
...
Fix missed errors in weave script
Fixes #2053 .
2016-03-17 20:09:37 +00:00
Bryan Boreham
0705319f25
Return failure from various functions when sub-operation fails.
...
We cannot rely on `set -e` to fail the whole script in contexts
where functions are called inside conditionals.
2016-03-17 15:02:40 +00:00
Bryan Boreham
b86e6412fa
Don't try to parse return from DELETE address
2016-03-17 12:06:34 +00:00
Matthias Radestock
aa1c1cc9be
ignore arping failures
...
This is a largely cosmetic change since arping really shouldn't fail.
2016-03-16 20:32:42 +00:00
Adam Harrison
4b5fb2785e
Merge pull request #2051 from weaveworks/issues/2046-static-ip
...
Fix plugin accepting --ip address
2016-03-16 15:46:49 +00:00
Bryan Boreham
4eaeb0f30c
Merge branch '1.4'
2016-03-16 14:52:59 +00:00
Bryan Boreham
9c096526b8
Merge pull request #2049 from weaveworks/issues/2016-retry-docker-event-subscription
...
Retry docker event subscription
2016-03-16 14:38:27 +00:00
Bryan Boreham
eee77d49d1
Claim IP takes CIDR not IP
2016-03-16 14:22:39 +00:00
Bryan Boreham
d2d1d2b43a
Test for docker network subnets and IPs
2016-03-16 13:47:30 +00:00
Adam Harrison
4874605add
Merge pull request #2050 from weaveworks/bump-ci-docker
...
Bump template name so it will fetch latest Docker
2016-03-16 13:46:49 +00:00
Adam Harrison
922f465ecb
Reset retry interval if we spent long enough processing events
2016-03-16 13:41:18 +00:00
Bryan Boreham
c80bf7e996
Bump template name so it will fetch latest Docker
2016-03-16 13:14:40 +00:00
Bryan Boreham
dd505a8e17
Merge pull request #2038 from weaveworks/wp-markdown-plugin-fixes
...
Doc fixes required by updated WP markdown plugin
2016-03-16 12:46:50 +00:00
Adam Harrison
08e9db900a
Retry docker event subscription
2016-03-16 09:23:32 +00:00
Matthias Radestock
86bfc91ac9
refactor: clearer IPAM config
2016-03-15 10:29:32 +00:00
Adam Harrison
2eeb754454
refactor: Introduce IPAM config object
2016-03-14 17:41:20 +00:00
Matthias Radestock
2a10182cf6
Merge pull request #2029 from weaveworks/router-and-proxy-always-restart
...
Router and proxy run with --restart=always
2016-03-14 17:19:47 +00:00
Adam Harrison
115162fbfd
Merge pull request #2037 from weaveworks/2021-fallback-to-hypervisor-uuid
...
fall back to hypervisor uuid for mac derivation
2016-03-14 16:56:00 +00:00
Adam Harrison
82adc85562
Router and proxy run with --restart=always
2016-03-14 16:31:06 +00:00
Matthias Radestock
05a7024b88
bump go-checkpoint version
2016-03-11 11:00:44 +00:00
Adam Harrison
62e8028591
Fixup link URLs
2016-03-11 10:52:58 +00:00
Adam Harrison
2bc5fd30c0
Make image paths absolute with respect to repo
2016-03-11 10:35:47 +00:00
Bryan Boreham
35671135bd
Return errors that happen inside WithNetNS
2016-03-10 15:18:16 +00:00
Bryan Boreham
a57335738d
Don't do unnecessary clock skew check in IPAM
2016-03-10 11:41:47 +00:00
Matthias Radestock
459bb08828
fall back to hypervisor uuid for mac derivation
...
since the system uuid is not available on paravirtual EC2 VMs, and
possibly other hypervisors.
Fixes #2021
2016-03-09 22:35:44 +00:00
Bryan Boreham
3ad9d8e785
Don't fail start if image is missing
2016-03-09 17:10:20 +00:00
Matthias Radestock
52552b59fb
Merge pull request #2024 from weaveworks/abstract-api-log
...
Abstract out logging function from weave api package
2016-03-09 15:45:00 +00:00
Matthias Radestock
f8e2af32cd
refactor: extract common docker run options
2016-03-08 23:10:19 +00:00
Bryan Boreham