Matthias Radestock
8fa24fd6d4
Merge branch '67_attach' of https://github.com/bboreham/weave into bboreham-67_attach
2014-09-23 14:51:11 +01:00
Matthias Radestock
f59b9577c8
Merge branch '67_attach' of https://github.com/bboreham/weave into bboreham-67_attach
2014-09-23 14:49:02 +01:00
Bryan Boreham
8e50e0759d
Make attach and detach idempotent
2014-09-23 14:49:00 +01:00
Bryan Boreham
2d8318b158
Improved test for blank string
2014-09-23 13:53:20 +01:00
Bryan Boreham
a6b83a1234
Updated instructions for attach and detach
2014-09-23 13:52:41 +01:00
Bryan Boreham
d1896e86d0
Redesigned attach/detach
2014-09-23 13:01:21 +01:00
Matthias Radestock
b5df59660f
don't set pcap timeout, to prevent cpu churn
...
pcap timeouts are a mystery. Setting the timeout to -1 used to reduce
latency, but that was before we started setting immediate mode. And it
turns out that with that timeout, pcap chews through a lot of CPU
polling its file descriptor, checking timers, etc.
With no timeout set an idle weave is completely idle - no system calls
at all.
Fixes #80
2014-09-23 11:06:41 +01:00
Bryan Boreham
7815446032
Merge pull request #78 from zettio/77_eliminate_connection_maker_tick
...
eliminate periodic 'tick' in connection_maker
2014-09-23 10:58:25 +01:00
Matthias Radestock
eecaa567fc
eliminate periodic 'tick' in connection_maker
...
checkStateAndAttemptConnections already performs a full scan of all
potential targets, from which we can easily determine the nearest
future time (or, rather, its duration from now) on which an attempt is
due.
We also need to kick the ConnectionMaker into action when we receive a
topology update containing new connections.
2014-09-22 23:15:54 +01:00
Matthias Radestock
d5e797f695
refactor: use better 'switch'
2014-09-22 22:34:46 +01:00
Matthias Radestock
f11f84fe17
refactor: we don't care about the tick time
2014-09-22 19:38:21 +01:00
Matthias Radestock
aa1e1b1d6c
cosmetic - remove comment for which we have an issue filed
2014-09-22 18:34:50 +01:00
Matthias Radestock
9e8260dc63
cosmetic
2014-09-22 18:14:37 +01:00
rade
e6041e082f
Merge pull request #76 from bboreham/tag_fix
...
Only push latest and git commit tag to DockerHub
2014-09-22 18:04:40 +01:00
Bryan Boreham
451d7d8778
Merge remote-tracking branch 'upstream/master' into HEAD
2014-09-22 17:57:32 +01:00
Bryan Boreham
1b524c4f27
Updated to reflect version-tagging process
2014-09-22 17:56:42 +01:00
Bryan Boreham
6ed2ab10a1
Only push two tags - latest and git-commit - to DockerHub
2014-09-22 17:44:13 +01:00
Bryan Boreham
0d3eebb208
Change -wait from bool to int number of seconds to wait
2014-09-22 16:48:55 +01:00
Bryan Boreham
5b93577054
log.Fatal() does os.Exit(1) so we don't need to do it again
2014-09-22 16:42:18 +01:00
rade
33e60b75bc
Merge pull request #74 from bboreham/28_retry_faster
...
Attempt re-connection immediately when notified of a broken connection
Fixes #28
2014-09-22 16:23:23 +01:00
Bryan Boreham
47310fbfc5
Described attach and detach commands
2014-09-18 18:00:58 +01:00
Bryan Boreham
0947fc204f
Untabify
2014-09-18 17:20:08 +01:00
Bryan Boreham
4868585d6e
Add detach command
2014-09-18 17:18:54 +01:00
Bryan Boreham
bb629bac84
Merge remote-tracking branch 'upstream/master' into 67_attach
2014-09-18 12:45:51 +01:00
Bryan Boreham
3c871e69d2
Merge branch 'master' of https://github.com/binocarlos/weave into 67_attach
...
Conflicts:
weaver/weave
2014-09-18 12:42:46 +01:00
Matthias Radestock
a2f725c627
Merge branch 'bboreham-61_cleanup_script'
...
Fixes #61
2014-09-18 12:32:01 +01:00
Bryan Boreham
a671ca1a89
Merge branch 'add-attach' of https://github.com/adieu/weave into 67_attach
2014-09-18 12:31:53 +01:00
Matthias Radestock
331c8553db
cosmetic
2014-09-18 12:30:43 +01:00
Matthias Radestock
b99e49a84f
Merge branch '61_cleanup_script' of https://github.com/bboreham/weave into bboreham-61_cleanup_script
2014-09-18 12:14:11 +01:00
Bryan Boreham
0ed57bad67
rm tempfile before we use it, to avoid attack via symlink
2014-09-18 11:56:15 +01:00
Bryan Boreham
86644f7615
cosmetic
2014-09-18 11:55:47 +01:00
Bryan Boreham
c48ae19c55
Tidy up messages; ensure errors to to stderr
2014-09-18 11:47:47 +01:00
Bryan Boreham
a75a0d8709
If and only if network setup because the container died, say so.
...
This involves capturing stderr output from all the 'ip' commands so we
can hide that output if we see the process died, or show it to the user
if the process didn't die, in which case we don't know why we failed.
2014-09-18 11:24:08 +01:00
Bryan Boreham
bfd5007339
Don't test if symlink exists before 'rm -f'
...
When the symlink's target doesn't exist, '[ -f' is false, so the symlink doesn't get removed.
Since we do always want it to be removed, just call 'rm -f' anyway, which won't complain
if the file doesn't exist.
2014-09-18 11:03:06 +01:00
Matthias Radestock
8eecbfca1f
Merge branch 'dpw-65_prevent_recapture'
...
Closes #65
2014-09-18 09:26:59 +01:00
Bryan Boreham
f0191639de
Start the tick again, in case we need it
2014-09-18 06:51:12 +01:00
Bryan Boreham
2720d24183
Attempt re-connection immediately when notified of a broken connection
2014-09-18 06:48:56 +01:00
Bryan Boreham
add13ff857
Add section to README on reboots
2014-09-18 06:18:43 +01:00
Bryan Boreham
e51f89268c
Stop waiting for interface after 5 seconds
2014-09-18 05:50:13 +01:00
David Wragg
12b969004e
Filter outbound packets in the kernel
...
It turns out that under Linux, libpcap implements the SetDirection
filtering in userspace, causing some spurious wake ups of the packet
capture thread. So set a BPF filter to discard outbound packets inside
the kernel.
2014-09-17 23:42:48 +01:00
Matthias Radestock
ce1d40afb8
cosmetic
2014-09-17 19:25:24 +01:00
Matthias Radestock
f5d9feac95
note that local traffic isn't captured
2014-09-17 19:24:32 +01:00
Matthias Radestock
f2c8d61abe
Merge branch '61_cleanup_script' of https://github.com/bboreham/weave into bboreham-61_cleanup_script
2014-09-17 16:50:44 +01:00
Bryan Boreham
2f5a9733b8
Take out debugging -x mode
2014-09-17 16:32:21 +01:00
Bryan Boreham
0a403dd081
untabify
2014-09-17 16:31:52 +01:00
Bryan Boreham
09aed84638
return not exit from function
2014-09-17 16:30:50 +01:00
Bryan Boreham
eabcc55f73
fix subshell syntax and make del/delete consistent
2014-09-17 16:25:46 +01:00
Bryan Boreham
fd7b034713
untabify
2014-09-17 16:11:30 +01:00
Bryan Boreham
7c979d6725
Remove veth and/or netns symlink if interface configuration fails part-way through
2014-09-17 15:44:34 +01:00
Matthias Radestock
11ccf4bbcb
cosmetic
2014-09-17 15:31:50 +01:00