reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,834 Commits 7 Branches 85 Tags
f5cd7b507378317b3807fb9056022981d82cef39
Commit Graph
4834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Harrison 5dd8584fb6 Fix veth cleanup on Ubuntu 15.10 
Cope with the @ characters that have started appearing in veth names as
of Ubuntu 15.10.
 2016-02-18 12:11:48 +00:00
Matthias Radestock 4bd18737b7 fix typo 2016-02-18 11:39:54 +00:00
Bryan Boreham ba8926a6ea Persist set of peers to connect to 2016-02-17 18:12:16 +00:00
Matthias Radestock 09cd9e091a Merge branch '1.4' 2016-02-16 14:09:06 +00:00
Matthias Radestock 17d53af2a2 improve logging of dns entry creation 
- log inside the lock, so we get proper serialisation
- include the container name, so we can identify the specific entry
 2016-02-16 14:04:34 +00:00
Adam Harrison 2d4d3577ba Merge pull request #1971 from weaveworks/issues/678-persist-ipam2 
Persist IPAM ring
 2016-02-15 10:15:53 +00:00
Bryan Boreham 546f9592f9 Hard-fail on persistence errors, otherwise the network can get confused on a restart. 
Create `Allocator.fatalf()`, for consistency
 2016-02-12 18:12:26 +00:00
Bryan Boreham 06f3793f05 Remove persisted IPAM ring data on peerName change 2016-02-12 18:12:26 +00:00
Bryan Boreham f396c60402 Persist the Ring 2016-02-12 18:12:26 +00:00
Bryan Boreham ad036499eb Add db infra to IPAM 2016-02-12 18:12:26 +00:00
Bryan Boreham 38c6eb28e8 Add basic infrastructure to use BoltDB for persistence 2016-02-12 18:12:26 +00:00
Matthias Radestock 11e2515f70 Merge pull request #1968 from weaveworks/refactor-veth-creation 
"refactor" veth creation
 2016-02-10 13:49:13 +00:00
Matthias Radestock c79e036c08 Merge pull request #1966 from weaveworks/issues/1965-fix-local-weave-ps 
Make weaveutil container-addrs observe $PROCFS

Fixes #1965.
 2016-02-09 22:40:36 +00:00
Matthias Radestock 7a19c2f147 add a test 2016-02-09 22:26:01 +00:00
Adam Harrison 4cee647e73 Make weaveutil container-addrs observe $PROCFS 2016-02-09 22:25:47 +00:00
Matthias Radestock 7ea3299dc6 oops 
/usr/local/bin/weave: 1172: [: true false: unexpected operator

This got broken in #1941.
 2016-02-09 22:05:11 +00:00
Matthias Radestock 5707581ba3 Merge pull request #1964 from weaveworks/weave-veth-cleanup 
Fix attach-bridge bugs
 2016-02-09 21:11:27 +00:00
Adam Harrison 264d5e4828 Make attach-bridge iptables rule insertion idempotent 2016-02-09 20:42:59 +00:00
Matthias Radestock 9311294d9c "refactor" veth creation 
Invoke the new create_veth from a few places, eliminating code
duplication and inconsistencies.

Semantic differences:

- init_bridged_fastdp now skips the veth creation/config if the veth
  already exists. This eliminates routing blips. Though in reality
  something very strange must have happened to end up in this code
  with an existing veth.
- init_bridged_fastdp no longer deletes the $BRIDGE and $DATAPATH when
  veth creation/configuration fails. This is consistent with
  init_bridge, which does not delete $BRIDGE when something goes
  wrong. And it is generally desirable since the init_* functions are
  invoked on potentially existing bridges - e.g. following 'weave
  stop'.
- attach_bridge and setup_router_iface_bridge used to mark one veth
  end 'up', then invoke add_iface_* for it, and then mark the other
  end 'up'. create_veth marks both ends 'up' first. This makes no
  practical difference in these cases.

notable other differences:
- we detect veth presence by checking whether *both* ends are present,
  rather than just one. We deliberately continue to (and fail in) the
  veth creation if one end already exists. This can only happen when
  we've stumbled across a different interface, since a veth end cannot
  exist independently. So it is right to treat this as an error.
- init_bridged_fastdp invokes add_iface_bridge instead of duplicating
  what that does. Also makes for nice coherence with the
  add_iface_fastdp it is invoking too.
 2016-02-09 19:22:14 +00:00
Adam Harrison 2bfc86e7b2 Cleanup attach-bridge iptables rule 2016-02-09 16:51:04 +00:00
Adam Harrison 36ee8bacb0 Remove all vethwe* interfaces in reset 2016-02-09 16:48:03 +00:00
Matthias Radestock 1bb1108b91 tiny refactor: use ${CONTAINER_IFNAME} for name construction 2016-02-09 16:40:58 +00:00
Matthias Radestock a77201bf77 Merge pull request #1955 from weaveworks/weave-attach-bridge 
'attach-bridge' feature to link an existing bridge netdev with the weave bridge
 2016-02-09 15:45:28 +00:00
Adam Harrison a3d842bf4a Implement attach-bridge 2016-02-09 15:20:11 +00:00
Adam Harrison 43eb70193b Merge branch '1.4' 2016-02-09 11:40:14 +00:00
Adam Harrison 1228dbddb9 Add release v1.4.4 v1.4.4 2016-02-09 11:20:51 +00:00
Adam Harrison a401d0d6ea Merge branch '1.4' 2016-02-09 10:53:52 +00:00
Adam Harrison c00b00d623 Merge pull request #1963 from weaveworks/issues/1959-dont-remove-network 
Don't remove weave network on plugin shutdown because it bricks Docker 1.10
 2016-02-09 10:53:13 +00:00
Bryan Boreham 7bbc9f1b82 Don't remove the weave network on shutdown because it bricks Docker 1.10 2016-02-09 10:02:06 +00:00
Matthias Radestock 6252871e93 Merge branch '1.4' 2016-02-09 09:30:19 +00:00
Matthias Radestock 15a92f9c92 Merge pull request #1961 from weaveworks/issues/1956-any-iface 
Wait for multicast route on any interface

Fixes #1956.
 2016-02-09 09:29:05 +00:00
Bryan Boreham 9386c01845 Wait for multicast route on any interface, to match weave script 
which only adds a route if there isn't one already
 2016-02-08 14:04:25 +00:00
Adam Harrison 6d1e33b558 Merge pull request #1957 from weaveworks/issues/1949-ring-errors 
Make error messages on ring merge clearer
 2016-02-08 13:52:59 +00:00
Bryan Boreham ed3c50f43e Merge pull request #1951 from weaveworks/issues/1940-remove-proxy-dockerbridgeip-dep 
Use netlink instead of shelling out to `weave docker-bridge-ip`
 2016-02-08 11:05:10 +00:00
Bryan Boreham 9ac62e8005 Extract common getenv-testing code 2016-02-08 10:46:18 +00:00
Bryan Boreham 034da376c4 Make error messages on ring merge clearer 2016-02-08 10:13:41 +00:00
Matthias Radestock 10fbc75997 Merge pull request #1922 from weaveworks/issues/1179-its-alive 
In IPAM, resurrect apparently-dead containers on ContainerStarted event
 2016-02-05 16:36:28 +00:00
Matthias Radestock 98d76e1099 Merge pull request #1941 from weaveworks/issues/1873-check-running-master 
Improve visibility of startup problems

Fixes #1873.
 2016-02-04 16:50:50 +00:00
Matthias Radestock f2a1b3829d tweak: consistency 2016-02-04 16:19:29 +00:00
Matthias Radestock e47c4a78f0 Merge pull request #1948 from weaveworks/test-claimforpeers 
Improve IPAM Ring unit testing, and streamline ring.ClaimForPeers
 2016-02-04 15:31:00 +00:00
Bryan Boreham f9f6649f90 Check some ring entries via AllRangeInfo, to improve coverage 2016-02-04 15:12:13 +00:00
Bryan Boreham a5c9898884 Checking for existing entries is pointless when the Ring starts empty 2016-02-04 15:12:13 +00:00
Bryan Boreham 839eb28310 Unit test for ring.ClaimForPeers 2016-02-04 15:11:46 +00:00
Adam Harrison e2ec2b436d Use netlink instead of shelling out to weave docker-bridge-ip 2016-02-04 14:00:01 +00:00
Bryan Boreham 07b79568dd Resurrect apparently-dead containers on ContainerStarted event 2016-02-04 13:49:43 +00:00
Bryan Boreham 1d3c80ab49 Merge pull request #1944 from weaveworks/issues/1940-remove-proxy-weaveps-dep 
Use netlink instead of shelling out to `weave ps`
 2016-02-04 13:45:58 +00:00
Bryan Boreham 38013d2f41 Kill zombies 2016-02-04 12:52:16 +00:00
Adam Harrison 65c48707f6 Use netlink instead of shelling out to weave ps 2016-02-04 12:51:18 +00:00
Adam Harrison 415e550f86 Merge pull request #1930 from weaveworks/issues/1746-always-use-host-netns 
Always use host netns
 2016-02-04 12:50:08 +00:00
Adam Harrison 034d8933c0 make multiweave work with weave running in the host netns 
Multiweave now creates a temporary bridge with an IP alias per router
in the host netns, and overrides the router to bind to that specific
IP for weave protocol and data traffic and http control.
 2016-02-03 11:57:12 +00:00