Matthias Radestock
bacc5836ea
log listeners
2015-10-16 09:34:20 +01:00
Matthias Radestock
230931a2c9
prevent accidental var shadowing
...
Fixes #1544
2015-10-16 01:05:04 +01:00
Matthias Radestock
61d289f414
Merge branch '1.1'
2015-10-15 18:14:20 +01:00
Matthias Radestock
44255862a9
prevent spurious errors from showing up
...
silly mistake
2015-10-15 18:12:56 +01:00
Matthias Radestock
ed9577150b
suppress spurious errors
2015-10-15 18:01:06 +01:00
Matthias Radestock
80319e7087
Merge branch '1.1'
2015-10-15 17:41:49 +01:00
Matthias Radestock
379048d8fc
make test/setup.sh work under go 1.5
...
Fixes #1543 .
2015-10-15 17:40:51 +01:00
Matthias Radestock
9ac655d774
Merge pull request #1526 from weaveworks/fdp-docs
...
Document fast data path feature
Fixes #1526 .
2015-10-15 17:29:29 +01:00
Adam Harrison
9b17470129
Document fast data path feature
2015-10-15 17:19:13 +01:00
Matthias Radestock
5c114fc6fe
Merge pull request #1536 from weaveworks/1515-print-json
...
Print request and response json when debugging weaveproxy
Fixes #1515
2015-10-15 15:59:35 +01:00
Bryan Boreham
efb12f41b2
Also print intercepted responses
2015-10-15 15:07:02 +01:00
Adam Harrison
813edcfe0a
Merge branch '1.1'
2015-10-15 14:59:29 +01:00
Adam Harrison
dea1405d71
Remove hardcoded docker bridge IP from proxy test
2015-10-15 14:39:56 +01:00
Ilya Dmitrichenko
e7f91b7529
Update screencast preview image
2015-10-15 14:26:39 +01:00
Matthias Radestock
5e8a64508e
Merge remote-tracking branch 'upstream/master'
2015-10-15 14:19:50 +01:00
Matthias Radestock
21ebb7a585
Merge branch '1.1'
...
Conflicts:
Makefile
2015-10-15 14:19:14 +01:00
David Wragg
6edd430538
Use consistent options for all "go get"/"go build" invocations
...
Without this, building with go-1.5 fails with
go get ./prog/weavewait
go install net: open /usr/local/go/pkg/linux_amd64/net.a: permission denied
This makes the options passed too "go get"/"go build" consistent for
all executables. So it should be safe with go-1.4.
Conflicts:
Makefile
2015-10-15 14:16:33 +01:00
Ilya Dmitrichenko
34606e0f9f
Link to the new screencast ( close #1402 )
2015-10-15 14:07:54 +01:00
Matthias Radestock
5f62f9edc7
Merge branch '1.1'
2015-10-15 13:05:35 +01:00
Matthias Radestock
0d2ff55c07
Merge pull request #1535 from weaveworks/1523-rewrite-inspect-failure
...
[proxy] only attempt to rewrite successful inspects
Fixes #1523 .
2015-10-15 13:04:34 +01:00
Matthias Radestock
207ee8667b
Merge pull request #1538 from dpw/detect-no-fastdp-mismatch
...
signal mismatches between WEAVE_NO_FASTDP and the bridge type
Fixes #1533 .
2015-10-14 17:17:35 +01:00
David Wragg
5984ed921e
signal mismatches between WEAVE_NO_FASTDP and the bridge type
2015-10-14 16:33:23 +01:00
Matthias Radestock
aac5fb8c24
Merge pull request #1537 from weaveworks/1502-flakey-test
...
Wait until container exits in test to remove race condition
Fixes #1502
2015-10-14 16:19:20 +01:00
Matthias Radestock
8cfc8b3132
Merge pull request #1528 from weaveworks/weave-env-bug
...
[proxy] Fix bug in weave env/config when passing multiple -H flags
Fixes #1527
2015-10-14 15:50:42 +01:00
Paul Bellamy
0b5ebd7b1d
Wait until container exits in test to remove race condition
2015-10-14 14:53:23 +01:00
Bryan Boreham
05dbe23563
Print request and response json when debugging
2015-10-14 13:45:51 +01:00
Paul Bellamy
fd07f59d16
[proxy] Fix bug in weave env/config when passing multiple -H flags
...
The echo in proxy_addr was not preserving newlines, so the multiple
addrs were all getting returned
2015-10-14 11:58:10 +01:00
Paul Bellamy
36de840c91
[proxy] only attempt to rewrite successful inspects
2015-10-14 11:28:43 +01:00
David Wragg
1000839309
Merge issues/1505-fast-datapath-weave-status' (PR #1525 )
...
Fast datapath weave status
2015-10-14 11:08:09 +01:00
Adam Harrison
ed4ed5fdcd
Include short peer ID in report JSON
2015-10-13 17:04:56 +01:00
Adam Harrison
eaf1f7cc13
Include overlay diagnostics in report JSON
2015-10-13 17:04:56 +01:00
Adam Harrison
ddfc8c2fa4
Handle JSON report marshalling error
2015-10-13 17:04:56 +01:00
Adam Harrison
91afa7f7f4
Include selected overlay type in connection status
2015-10-13 17:04:56 +01:00
Paul Bellamy
da49e71eb8
Merge pull request #1529 from weaveworks/expose-proxy-tls
...
Expose some tls functions from the proxy for use elsewhere.
2015-10-13 16:09:27 +01:00
Tom Wilkie
5b8ce8ebae
Expose some tls functions from the proxy for use elsewhere.
2015-10-13 14:56:11 +00:00
Adam Harrison
827bcd898e
Merge pull request #1438 from weaveworks/fdp
...
Fast datapath
2015-10-13 10:34:49 +01:00
Matthias Radestock
54a4add40f
cosmetic
2015-10-13 09:02:03 +01:00
David Wragg
0093eb1220
A smoke test for WEAVE_NO_FASTDP
...
Partly for the side effect of restoring coverage of
router/ethernet_decoder.go
2015-10-12 21:27:11 +01:00
David Wragg
b56ff7678c
Make code coverage work through the proxy
...
Previously, the proxy would run the weave script in ways that did
not run the weaver executable. Now they can. This is a problem because
of the contortions involved in using golang's code coverage support
in the integration tests, which require the weaver command line args to
be slightly mangled.
2015-10-12 21:27:11 +01:00
David Wragg
431197042d
Weave script changes to enable fast datapath
...
This means:
* The 'weave' netdev is an OVS datapath
* The weave router container runs with --net=host in order to access
the datapath.
* The MTU is set to a smaller value, to allow vxlan encapsulation.
Setting the WEAVE_NO_FASTDP environment variable disables these
things, effectively running the router without fast datapath. It is
an environment variable rather than an option to 'weave launch'
because it takes effect in create_bridge, which is called from many
subcommands, and it doesn't seem practical to add option processing to
all of them.
2015-10-12 21:27:11 +01:00
David Wragg
295876e1d1
Fast datapath
2015-10-12 21:27:11 +01:00
David Wragg
e8f975e44f
Introduce checkFatal in prog/weaver/main.go
2015-10-12 21:27:11 +01:00
David Wragg
bc026ab49a
Show the overlay name in sleeve log messsages
2015-10-12 21:27:11 +01:00
David Wragg
f56457271d
OverlaySwitch
2015-10-12 21:27:11 +01:00
David Wragg
bc5250c899
Replace OverlayForwarderListener with channels
...
It's more robust to signal the conditions asynchronously via channels
rather than callbacks.
2015-10-12 21:27:11 +01:00
David Wragg
971511e1c5
Introduce PeerShortIDs
...
These are needed to support vxlan encapsulation. In a vxlan packet,
the only place we can straightforwardly hold the source and
destination peer identifiers used by the weave router is in the
24-bit VNI (vxlan network identifier) field. This gives us 12 bits to
indicate a peer. The resulting limit of 4096 peers on a weave network
does not seem like a problem in the near future. But it does mean
that decentralized allocation makes collisions fairly likely even in
weave networks of sizes that are common today. Fortunately, the
problem is much more tractable than IPAM because we can detect when
collisions occur and take action to resolve them.
2015-10-12 21:27:11 +01:00
David Wragg
51317dca70
Introduce PeersPendingNotifications
2015-10-12 21:27:11 +01:00
David Wragg
91dda08165
Rename Peers "table" field to "byName"
2015-10-12 21:27:11 +01:00
David Wragg
67bfa5bc90
applyUpdate can return a PeerNameSet
2015-10-12 21:27:11 +01:00
David Wragg
0841f4a27d
Tidy broadcastPeerUpdate
2015-10-12 21:27:11 +01:00
Matthias Radestock