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
3,562 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

3562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Boulle
17bd5c3d21 Merge pull request #1373 from jonboulle/header 
main: add header
 2014-10-23 15:37:35 -07:00
Jonathan Boulle
0d36385bb4 main: add header 2014-10-23 14:46:05 -07:00
Yicheng Qin
4089475c90 Merge pull request #1361 from unihorn/182 
etcdserver: refactor cluster and clusterStore
 2014-10-23 14:40:37 -07:00
Yicheng Qin
4d80f01201 etcdserver: Cluster.IsIDremoved -> Cluster.IsIDRemoved 2014-10-23 14:29:58 -07:00
Xiang Li
c25c50582e doc: add admin api doc 2014-10-23 14:26:33 -07:00
Yicheng Qin
d47de988e4 etcdserver: panic when >1 members have the given name in MemberByName 2014-10-23 14:24:07 -07:00
Yicheng Qin
5fbe6c7134 main: add genClusterString func and its test 2014-10-23 14:19:40 -07:00
Yicheng Qin
8eee8c260e etcdserver: rebase on master and code clean 2014-10-23 13:58:55 -07:00
Yicheng Qin
e21de51768 etcdserver: remove NewClusterFromMemberInfos 2014-10-23 13:27:55 -07:00
Yicheng Qin
f8b8bdeb17 etcdserver: use path.Join for member key in cluster 2014-10-23 13:27:54 -07:00
Yicheng Qin
3d243baacd etcdserver: generate id when new cluster 2014-10-23 13:27:54 -07:00
Yicheng Qin
d2c4e981ed etcdserver: Member.Pick -> Member.PickPeerURL 2014-10-23 13:27:54 -07:00
Yicheng Qin
67412e07f8 etcdserver: MemberFromName -> MemberByName 2014-10-23 13:27:54 -07:00
Yicheng Qin
89572b5fd7 etcdserver: refactor cluster and clusterStore 
Integrate clusterStore into cluster, and let cluster become the source of
cluster info.
 2014-10-23 13:27:54 -07:00
Soheil Hassas Yeganeh
09e9618b02 raft: change raftLog.maybeAppend to return the last new index 
As per @unihorn's comment on #1366, we change raftLog.maybeAppend to
return the last new index of entries in maybeAppend.
 2014-10-23 15:42:47 -04:00
Soheil Hassas Yeganeh
233617bea2 raft: Make MsgAppRes ack only the last index in MsgApp 
As explained in #1366, the leader will fail to transmit the missed
logs if the leader receives a hearbeat response from a follower
that is not yet matched in the leader. In other words, there are
append responses that do not explicitly reject an append but
implied a gap.

This commit is based on @xiangli-cmu's idea. We should only acknowledge
upto the index of logs in the append message. This way responses to
heartbeats would never interfer with the log synchronization because
their log index is always 0.

Fixes #1366
 2014-10-23 14:56:17 -04:00
Xiang Li
16c9970a03 Merge pull request #1365 from xiangli-cmu/admin_get 
etcdserver: support GET on admin endpoint
 2014-10-23 11:30:51 -07:00
Xiang Li
86facb3f91 etcdhttp: sort member 2014-10-23 11:21:20 -07:00
Xiang Li
8d6bb4a471 etcdserver: support GET on admin endpoint 2014-10-23 10:53:55 -07:00
Xiang Li
051ad7585f Merge pull request #1363 from coreos/return_json 
etcdserver: admin PUT returns the json representation of the newly creat...
 2014-10-22 20:11:08 -07:00
Brandon Philips
2cb8efb9b5 Merge pull request #1362 from philips/consistent-hex-use 
etcdserver: use hex for cluster and machine id
 2014-10-22 18:43:21 -07:00
Brian Waldon
1539d5c49c etcdctl: update to meet go vet 2014-10-22 17:52:40 -07:00
Brian Waldon
69842b344d etcdctl: reflect build script location in README.md 2014-10-22 17:52:40 -07:00
Brian Waldon
52e08720b7 etcdctl: remove build indicator from README.md 2014-10-22 17:52:40 -07:00
Brian Waldon
29ef918808 etcdctl: import from external repo 2014-10-22 17:52:40 -07:00
Brian Waldon
9f2a42bf7d godep: add deps for etcdctl 2014-10-22 17:52:40 -07:00
Brian Waldon
9af5b74a8d gitignore: be more specific when ignoring /etcd 2014-10-22 17:52:40 -07:00
Brian Waldon
46be5d7d5f version: move version string into new package 2014-10-22 17:52:40 -07:00
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
ec7af4f519 Merge pull request #1359 from philips/fix-mismatch-error 
etcdserver: fixup mismatch error line
 2014-10-22 15:55:41 -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
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