rade
ca2854e059
Merge pull request #83 from binocarlos/master
...
correct weave usage output: change -passwd to -password
2014-09-25 07:31:18 +01:00
Kai Davenport
f6b8e9a675
change -passwd to -password in usage function
2014-09-24 14:19:40 -07:00
Bryan Boreham
573ec22087
Fixed typo
2014-09-24 12:43:56 +01:00
Matthias Radestock
ada941cfcb
Merge branch 'bboreham-54_reboot'
...
Closes #54
2014-09-24 12:24:31 +01:00
Matthias Radestock
ebe8207f8a
typo
2014-09-24 12:23:51 +01:00
Matthias Radestock
976c62a104
Merge branch 'bboreham-67_attach'
...
Closes #67
2014-09-24 12:20:47 +01:00
Matthias Radestock
e64551c608
Merge branch '67_attach' of https://github.com/bboreham/weave into bboreham-67_attach
2014-09-24 11:41:28 +01:00
Bryan Boreham
704c3dad67
Improved comment
2014-09-24 10:17:45 +01:00
Bryan Boreham
ad3a36686f
Cosmetic
2014-09-24 10:11:36 +01:00
Bryan Boreham
57ad2cbeaf
Merge remote-tracking branch 'upstream/master' into 67_attach
...
Conflicts:
pcap.go
2014-09-24 10:09:25 +01:00
Bryan Boreham
a4ffb4e45a
Revert "don't set pcap timeout, to prevent cpu churn"
...
This reverts commit b5df59660f
2014-09-24 10:07:49 +01:00
Bryan Boreham
d5acb312b4
Rename 'configure_container_networking' to 'attach'
2014-09-24 10:01:52 +01:00
Bryan Boreham
dc611fa0af
Refactor common code in attach/detach
2014-09-24 09:39:44 +01:00
Matthias Radestock
53d4d469bb
Merge branch 'master' into bboreham-67_attach
2014-09-23 18:09:46 +01:00
Matthias Radestock
025315363d
prevent CPU churn by setting long pcap timeout
...
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. However, the
behaviour of setting *no* timeout is defined as, err, undefined. So
instead we set a very long timeout indeed. And loop if it expires.
Fixes #80
2014-09-23 17:54:40 +01:00
Matthias Radestock
d10ce1e801
reword
2014-09-23 17:24:52 +01:00
Bryan Boreham
d80a5c8dff
Revert "don't set pcap timeout, to prevent cpu churn"
...
This reverts commit b5df59660f#81
2014-09-23 16:56:08 +01:00
Matthias Radestock
02efccc36a
cosmetic
2014-09-23 16:18:00 +01:00
Matthias Radestock
5477f671db
Merge branch '54_reboot' of https://github.com/bboreham/weave into bboreham-54_reboot
2014-09-23 16:13:45 +01:00
Bryan Boreham
a21860689a
Merge remote-tracking branch 'upstream/bboreham-67_attach' into 67_attach
2014-09-23 16:05:45 +01:00
Bryan Boreham
9e3cbba275
Capture error output from ip command and check if error was caused by container dying
2014-09-23 16:00:03 +01:00
Matthias Radestock
ff3fbaede9
tweak & move docs for 'attach' and 'detach'
2014-09-23 15:32:53 +01:00
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
rade