Barak Michener
1f84991b3a
Merge pull request #1355 from barakmich/cluster_after_wal
...
etcdserver: Check the initial cluster settings after checking if the WAL...
2014-10-22 18:31:28 -04:00
Brandon Philips
400dd2d7bc
etcdserver: cleanup the cluster ID error message
...
1) Don't panic since we know exactly where this is coming from and don't
need the user to see a full back trace
2) Add docs explaining this situation a bit further
3) Cleanup the error to look like other similiar errors
2014-10-22 15:26:35 -07:00
Barak Michener
e42d65da12
etcdserver: Check the initial cluster settings after checking if the WAL exists
2014-10-22 18:16:43 -04:00
Xiang Li
d27d308935
Merge pull request #1356 from coreos/fix_dis
...
main: use our own flagset in setupCluster
2014-10-22 14:55:40 -07:00
Xiang Li
5444a366da
main: use our own flagset in setupCluster
2014-10-22 14:51:51 -07:00
Xiang Li
5780dfe690
Merge pull request #1347 from coreos/gen_nodeID
...
etcdserver: etcdserver generates the ID when adding new member.
2014-10-22 14:30:49 -07:00
Xiang Li
6d9eb57555
etcdhttp: test bad url for POST on admin endopint
2014-10-22 14:27:08 -07:00
Xiang Li
d6a5dc9e61
Merge pull request #1352 from coreos/fix_main
...
main: fix default case
2014-10-22 14:05:11 -07:00
Xiang Li
ca4f12182a
main: fix default case
2014-10-22 13:49:52 -07:00
Xiang Li
d00152765a
etcdserver: etcdserver generates the ID when adding new member.
...
When adding new member, the etcdserver generates the ID based on the current time
and the given peerurls. We include time to add the uniqueness, since the node with
same peerurls should be able to (add, then remove) several times.
2014-10-22 13:15:56 -07:00
Barak Michener
13656eb4e7
Merge pull request #1340 from barakmich/better_ids2
...
etcdserver: Calculate IDs based on PeerURLs and --initial-cluster-name
2014-10-22 14:49:49 -04:00
Barak Michener
829cec8ccf
Merge stylistic comments
2014-10-22 14:26:05 -04:00
Yicheng Qin
6b32395637
Merge pull request #1343 from unihorn/175
...
etcdserver: record removed member to check incoming message
2014-10-22 11:16:55 -07:00
Yicheng Qin
5014558b00
etcdserver: clean code
2014-10-22 11:09:36 -07:00
Yicheng Qin
3162ead7b1
etcdhttp: do message statistics only on valid ones
2014-10-22 11:09:36 -07:00
Yicheng Qin
9ad4a8e33a
etcdserver: add isKeyNotFound helper func
2014-10-22 11:09:36 -07:00
Yicheng Qin
89b032cd69
etcdserver: Member.storeKey -> memberStoreKey
2014-10-22 11:09:36 -07:00
Yicheng Qin
7498234e40
etcdserver: record removed member to check incoming message
2014-10-22 11:09:35 -07:00
Yicheng Qin
b40d30a8d2
Merge pull request #1346 from unihorn/178
...
integration: fix master
2014-10-22 11:09:06 -07:00
Barak Michener
c5d1fcd70a
fix wrong name
2014-10-22 13:58:43 -04:00
Barak Michener
cb5a638c44
style comments
2014-10-22 13:52:42 -04:00
Barak Michener
52dedab7b4
Move setupCluster inside startEtcd
2014-10-22 13:52:42 -04:00
Barak Michener
502a3c2460
Refactor Cluster to hold and add members.
2014-10-22 13:52:42 -04:00
Barak Michener
1347e3952f
docs and cluster ID change based on name
2014-10-22 13:52:42 -04:00
Barak Michener
ad0b7b7dbb
Add cluster name to etcd flags
2014-10-22 13:52:42 -04:00
Barak Michener
1ca7c031ff
first round of comments
...
Conflicts:
etcdserver/config.go
etcdserver/config_test.go
etcdserver/server.go
main.go
2014-10-22 13:49:54 -04:00
Barak Michener
456d1ebcae
etcdserver: Calculate IDs for nodes solely on PeerURLs
...
Removes the notion of name being anything more than advisory or
command-line grouping, and adds checks for bootstrapping the command
line. IDs are consistent if the URLs are consistent.
2014-10-22 13:49:54 -04:00
Yicheng Qin
4f52d371c1
integration: skip TestGoroutinesRunning
2014-10-22 10:10:43 -07:00
Brandon Philips
e475388bc0
Merge pull request #1294 from kelseyhightower/issue_619_fix_listing_docs
...
doc: fix listing a directory
2014-10-22 09:53:48 -07:00
Yicheng Qin
48992cced3
Merge pull request #1344 from unihorn/176
...
integration: add remaining goroutine check
2014-10-21 18:05:28 -07:00
Yicheng Qin
f356648252
integration: add remaining goroutine check
2014-10-21 16:59:14 -07:00
Yicheng Qin
f26bb6ad44
Merge pull request #1335 from unihorn/174
...
etcdserver/etcdhttp: store location adjustment
2014-10-21 16:24:30 -07:00
Yicheng Qin
06b196e345
etcdhttp: writeEvent -> writeKeyEvent
2014-10-21 16:10:49 -07:00
Yicheng Qin
ca73f25615
etcdhttp: parseRequest -> parseKeyRequest
2014-10-21 16:10:49 -07:00
Yicheng Qin
e2b6a4fc4c
etcdserver: const XXXDir -> StoreXXXPrefix
...
and code clean
2014-10-21 16:10:49 -07:00
Yicheng Qin
2ff3cac653
etcdserver/etcdhttp: store location adjustment
...
Detailed adjustment:
/_etcd/machines/* -> /0/members/*
/* -> /1/*
And it keeps key path returned to user the same as before.
2014-10-21 16:10:19 -07:00
Xiang Li
0398a31b16
Merge pull request #1339 from coreos/checkcid
...
etcdserver: checking clusterID
2014-10-21 16:00:49 -07:00
Xiang Li
e69c37adf0
etcdserver: panic on clusterid mismatch
2014-10-21 15:22:16 -07:00
Xiang Li
00dc61d169
Merge pull request #1341 from coreos/fix_bench
...
raft: fix node bench
2014-10-21 13:01:37 -07:00
Xiang Li
48c4145f1b
raft: fix node bench
2014-10-21 12:46:39 -07:00
Xiang Li
a9984fda4f
Merge pull request #1102 from coreos/node_bench
...
raft: add a one node bench
2014-10-21 11:44:46 -07:00
Xiang Li
50d4abc676
raft: add a one node bench
2014-10-21 11:43:55 -07:00
Jonathan Boulle
c3f83f9275
Merge pull request #1337 from jonboulle/govet
...
tests: add `go vet` coverage
2014-10-21 11:40:26 -07:00
Jonathan Boulle
341c7190d3
test: add govet to tests
2014-10-21 11:32:38 -07:00
Xiang Li
894e678ad6
etcdserver: checking clusterID
2014-10-21 11:05:24 -07:00
Jonathan Boulle
ae4403c945
test: add discovery to tests
2014-10-21 00:17:14 -07:00
Xiang Li
a44849deec
Merge pull request #1286 from coreos/clusterid
...
*: generate clusterid
2014-10-20 19:07:03 -07:00
Jonathan Boulle
99dd42026b
Merge pull request #1336 from jonboulle/govet
...
*: fix various formatting issues
2014-10-20 18:23:26 -07:00
Jonathan Boulle
b3d5333cb3
*: fix various formatting issues
2014-10-20 17:55:18 -07:00
Xiang Li
0fd28169c8
etcdserver: use id,cid
2014-10-20 16:35:41 -07:00
