Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,844 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

1539 Commits

Author SHA1 Message Date
Xiang Li
63fa2a626a etcdserver: admin PUT returns the json representation of the newly created member 2014-10-22 17:19:28 -07:00
Xiang Li
712a05be83 Merge pull request #1357 from coreos/accept_json 
etcdserver: admin endpoint accepts json body
 2014-10-22 16:30:22 -07:00
Brandon Philips
ab90369f9e etcdserver: use hex for cluster and machine id 
Continue using hex everywhere. Including here.

TODO: cleanup the printing of the structs which currently have decimal
to/from:

`{Type:MsgAppResp To:9973738105406047488 From:17050684879817348455 T...`
 2014-10-22 16:24:50 -07:00
Xiang Li
7be0f4b618 etcdserver: admin endpoint accepts json body 2014-10-22 16:19:48 -07:00
Brandon Philips
0d0bc3a57e etcdserver: fixup mismatch error line 
Both wcid and gcid are strings, don't try to print it out in hex.
 2014-10-22 15:48:22 -07:00
Brandon Philips
2c21ae0f16 Merge pull request #1358 from philips/etcdserver-cleanup-cluster-id-msg 
etcdserver: cleanup the cluster ID error message
 2014-10-22 15:42:30 -07:00
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
6d9eb57555 etcdhttp: test bad url for POST on admin endopint 2014-10-22 14:27:08 -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
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
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
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
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
e69c37adf0 etcdserver: panic on clusterid mismatch 2014-10-21 15:22:16 -07:00
Xiang Li
894e678ad6 etcdserver: checking clusterID 2014-10-21 11:05:24 -07:00
Xiang Li
a44849deec Merge pull request #1286 from coreos/clusterid 
*: generate clusterid
 2014-10-20 19:07:03 -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
Xiang Li
dc68dc9ebd etcdserver: add a todo for clusterid generation 2014-10-20 16:26:31 -07:00
Yicheng Qin
92230cee63 Merge pull request #1333 from unihorn/172 
etcdserver/raft: remove msgDenied, removedNodes, shouldStop
 2014-10-20 16:04:09 -07:00
Yicheng Qin
e200d2a8e2 etcdserver/raft: remove msgDenied, removedNodes, shouldStop 
The future plan is to do all these in etcdserver level.
 2014-10-20 15:13:18 -07:00
Xiang Li
ea6bcacfe4 *: generate clusterid 2014-10-20 15:00:54 -07:00
Yicheng Qin
f7a0d5387b etcdserver: stop server gracefully 2014-10-20 14:43:21 -07:00
Yicheng Qin
058537f34a main: add basic functional test 2014-10-20 14:43:21 -07:00
Yicheng Qin
dcaa7f0a37 Merge pull request #1328 from unihorn/169 
skip initial-cluster check when reboot
 2014-10-20 13:06:24 -07:00
Yicheng Qin
17382ec905 etcdserver: skip initial-cluster check when reboot 
If etcd is provided with data-dir that has data, it will not use
initial-cluster, and initial-cluster could be set to be empty.
 2014-10-20 12:41:07 -07:00
Jonathan Boulle
7a4d42166b *: add license header to all source files 2014-10-17 15:41:22 -07:00
Yicheng Qin
aa176610f3 main: remove duplicated self name check 2014-10-17 15:37:30 -07:00
Jonathan Boulle
e0801360d3 godep: update clockwork dependency 2014-10-17 10:05:29 -07:00
Jonathan Boulle
ec18e46641 etcdserver/etcdhttp: switch to using fake clock 2014-10-17 10:05:29 -07:00
Jonathan Boulle
c5ba66e6aa Merge pull request #1319 from jonboulle/stats_race 
etcdserver: fix data race in retrieving self stats
 2014-10-17 09:04:17 -07:00
Jonathan Boulle
da64e7509c etcdserver/stats: lock on leaderstats too 2014-10-17 00:11:25 -07:00
Jonathan Boulle
1fa763b47b store: remove unused function 2014-10-17 00:07:23 -07:00
Jonathan Boulle
82023c591d etcdserver/stats: log any marshaling error 2014-10-16 23:05:48 -07:00