e20b487904
Merge pull request #2978 from xiang90/fix_backup
...
*:fix point-in-time backup
2015-06-15 13:19:29 -07:00
f59da0e453
*:fix point-in-time backup
...
Backup process should be able to read all WALs until io.EOF to
generate a point-in-time backup.
Our WAL file is append-only. And the backup process will lock all
files before start reading, which can prevent the gc routine from
removing any files in the middle.
2015-06-15 11:12:28 -07:00
b69d52e5ac
Merge pull request #2988 from xiang90/raft-doc
...
raft: fix usage section of doc
2015-06-15 10:39:40 -07:00
2f0169c3ab
raft: fix usage section of doc
...
We recently added a config struct to start raft. Update
our doc accordingly.
2015-06-15 10:26:10 -07:00
5618adff99
Merge pull request #2977 from nikfoundas/patch-1
...
docs: add etcd-viewer into libraries-and-tools.md
2015-06-14 08:53:06 -07:00
3fc8d48421
Merge pull request #2982 from aybabtme/etcdserver/wrong-log-func
...
etcdserver: use Infof to print formatted argument
2015-06-14 06:53:20 -07:00
270487d340
etcdserver: use Infof to print formatted argument
2015-06-14 20:22:21 +07:00
dadbc03171
docs: add etcd-viewer into libraries-and-tools.md
...
I've been working on this project for a few weeks and I believe it has some features that could assist maintaining etcd registries. Please check it out and I hope you would like to include it in your list of etcd tools.
Kind regards,
Nikos
2015-06-14 02:25:42 +03:00
8e7fa9e201
Merge pull request #2976 from yichengq/fix-lock-test
...
pkg/fileutil: wait longer for relock
2015-06-12 15:20:18 -07:00
7723b91c06
pkg/fileutil: wait longer for relock
...
multiple cpu running makes it slower, so it waits longer for relock.
2015-06-12 15:17:28 -07:00
219d304291
Merge pull request #2968 from yichengq/fix-stream-reader-init
...
rafthttp: always init streamReader before return from newPeer
2015-06-12 14:51:05 -07:00
288cce0d76
Merge pull request #2975 from yichengq/fix-purge-test
...
pkg/fileutil: wait longer before checking purge results
2015-06-12 14:38:55 -07:00
7ff1fa36f2
rafthttp: always init streamReader before return from newPeer
...
Or etcd will panic if someone calls `setTerm()`, which uses streamReader
internally, before streamReader is inited.
2015-06-12 14:38:14 -07:00
75f91bab5c
pkg/fileutil: wait longer before checking purge results
...
multiple cpu running may be slower than single cpu running, so it may
take longer time to remove files.
Increase from 5ms to 20ms to give it enough time.
2015-06-12 14:36:15 -07:00
684c721307
Merge pull request #2970 from yichengq/fix-stream-test
...
rafthttp: use buffered channel as recv/prop chan
2015-06-12 14:34:52 -07:00
dccec11bb4
Merge pull request #2973 from yichengq/fix-recv-log
...
rafthttp: fix the misformat logging line, and rename internal var for more clarity
2015-06-12 14:27:17 -07:00
36f75cf062
rafthttp: use buffered channel as recv/prop chan
...
So it ensures that the message will not be discarded because the receive
side has not been ready, which happens easily in multiple core test.
Use log.fatal instead of log.error. The test exits when there is
something wrong because the error may affect following test cases.
2015-06-12 14:25:11 -07:00
2f05b24d6d
rafthttp: {from, to} -> {local, remote} in stream
...
{from, to} nameings are confused when it both dials and receives
messages from the remote. Change it to {local, remote} for better
clarity.
2015-06-12 14:17:30 -07:00
bcc1aadea9
rafthttp: fix the misformat logging line
...
before:
```
2015/06/12 20:06:19 rafthttp: dropped MsgApp from %!s(uint64=2) since
receiving buffer is full
```
after:
```
2015/06/12 13:51:38 rafthttp: dropped MsgProp from 2 since receiving
buffer is full
```
2015-06-12 14:12:49 -07:00
ae42371ee2
Merge pull request #2965 from yichengq/fix-issue2904
...
integration: fix TestIssue2904 in multiple cores
2015-06-12 13:53:00 -07:00
b98aa3a9e0
Merge pull request #2972 from yichengq/test-longer
...
test: extend integration timeout to 10m
2015-06-12 13:42:54 -07:00
768cb437bc
test: extend integration timeout to 10m
...
We test with `-cpu 1,2,4` now, and it takes longer time.
2015-06-12 13:41:35 -07:00
796d99c390
integration: fix TestIssue2904 when multiple cores
...
Do not wait for the cluster view of removed member to match with
expected view, since removed member does not apply entries after it is
removed.
2015-06-12 10:20:27 -07:00
ea3c7d1d31
Merge pull request #2960 from yichengq/fix-drop-flood
...
rafthttp: pretty print message drop info
2015-06-12 09:23:23 -07:00
0de0e4b77c
rafthttp: pretty print message drop info
2015-06-12 09:14:53 -07:00
e46fa0a213
Merge pull request #2957 from yichengq/fix-pipeline-test
...
rafthttp: fix TestStopBlockedPipeline
2015-06-12 08:03:12 -07:00
c21cc5b39b
rafthttp: fix TestStopBlockedPipeline
...
Refactor the fake cancel implementation.
The old one may cancel other in-flight message in random, which leaves
the original target message blocked forever.
2015-06-12 07:55:12 -07:00
29dca49cb5
rafthttp: wait 1ms before enabling cancel
...
CancelRequest only effects on in-flight request, so we need to wait
for Do(request) called before enabling cancel.
2015-06-12 07:55:06 -07:00
d8e1950d4e
Merge pull request #2963 from xiang90/fix_discovery_error
...
etcdmain: exit if discovery fails
2015-06-11 16:11:59 -07:00
6c8b32d316
etcdmain: exit if discovery fails
...
Fix #2919
If discovery fails, etcd will hang there and does nothing. This
commit fixes the problem.
2015-06-11 15:45:00 -07:00
3e706c745c
Merge pull request #2953 from yichengq/etcdmain-plog
...
etcdmain: var log -> plog
2015-06-11 15:30:18 -07:00
1c19eb47b5
Merge pull request #2956 from xiang90/log
...
all pkgs use leveled log
2015-06-11 15:29:44 -07:00
2c5ab7ff8b
discovery: fix infoln -> info
2015-06-11 14:22:14 -07:00
8ad7ed321e
*:godep log pkg
2015-06-11 14:22:14 -07:00
2373fd8426
wal: fix the left logging using default log
2015-06-11 14:22:14 -07:00
2db8b53c4b
discovery: use leveled log
2015-06-11 14:22:14 -07:00
f013a627a4
etcdserver/stats: use leveled log
2015-06-11 14:22:14 -07:00
cf7cb2b8a9
etcdserver/security: use leveled log
2015-06-11 14:22:14 -07:00
2f795e42d0
httptypes: use leveled log
2015-06-11 14:19:53 -07:00
4b5dbeff9b
pkg/pbutil: use leveled log
2015-06-11 14:19:53 -07:00
865a5ffc61
pkg/osutil: use leveled log
2015-06-11 14:19:53 -07:00
a45f53986f
pkg/netutil: use leveled log
2015-06-11 14:19:52 -07:00
69819d334a
pkg/flags: use leveled log
2015-06-11 14:19:52 -07:00
7bf0479e66
Merge pull request #2882 from barakmich/security_client_new
...
*: Add security/authorization to etcd/client and etcdctl
2015-06-11 13:40:32 -04:00
1764837783
etcdmain: clean up plog.Printf
...
Put it into different log levels.
2015-06-11 10:24:02 -07:00
ecdf0a8146
Merge pull request #2959 from yichengq/fix-update-member
...
rafthttp: fix TestUpdateMember
2015-06-11 10:02:13 -07:00
1af2b4cad7
rafthttp: fix TestUpdateMember
...
Before this PR, it may error like this:
```
--- FAIL: TestUpdateMember-2 (0.00s)
server_test.go:950: action =
[{ApplyConfChange:ConfChangeUpdateNode []}
{ProposeConfChange:ConfChangeUpdateNode []}], want
[{ProposeConfChange:ConfChangeUpdateNode []}
{ApplyConfChange:ConfChangeUpdateNode []}]
```
This fixes the test by recording the proposal event in time.
2015-06-11 09:45:34 -07:00
cd629c9b44
Merge pull request #2939 from yichengq/fix-update-attr
...
etcdserver: allow to update attributes of removed member
2015-06-10 16:53:39 -07:00
8725e69cf7
etcdserver: allow to update attributes of removed member
...
There exist the possiblity to update attributes of removed member in
reasonable workflow:
1. start member A
2. leader receives the proposal to remove member A
2. member A sends the proposal of update its attribute to the leader
3. leader commits the two proposals
So etcdserver should allow to update attributes of removed member.
2015-06-10 16:52:18 -07:00
743ac73b11
Merge pull request #2954 from xiang90/fix_test
...
proxy: fix test
2015-06-10 16:44:58 -07:00
Xiang Li