Jonathan Boulle
0276089ed9
etcdserver: fix + expand config tests
2014-10-24 10:09:42 -07:00
Jonathan Boulle
3a41161e76
Merge pull request #1384 from jonboulle/test
...
etcdserver: add test for cluster.String
2014-10-24 10:03:37 -07:00
Jonathan Boulle
b9514ea265
etcdserver: add test for cluster.String
2014-10-24 10:03:28 -07:00
Xiang Li
4c9d67aaa2
Merge pull request #1379 from xiangli-cmu/fix_member
...
etcdserver: fix member endpoint on peerurl
2014-10-23 17:25:40 -07:00
Xiang Li
ed29259801
etcdserver: fix member endpoint on peerurl
2014-10-23 17:18:01 -07:00
Brian Waldon
500d21591f
Merge pull request #1377 from bcwaldon/client-cleanup
...
Make httpClient.SetPrefix safer
2014-10-23 16:35:45 -07:00
Brian Waldon
992e7c76e0
client: copy v2KeysPrefix to httpClient
...
It's poor form to muck with a global variable. Make a copy when the
httpClient object is instantiated to make httpClient.SetPrefix safe.
2014-10-23 16:31:45 -07:00
Brian Waldon
a85a47c8f9
client: s/v2URL/v2KeysURL/
2014-10-23 16:31:42 -07:00
Brian Waldon
ebe32689d4
client: s/v2Prefix/DefaultV2KeysPrefix/
2014-10-23 16:30:56 -07:00
Jonathan Boulle
d1d12abfd7
Merge pull request #1372 from jonboulle/proxy
...
main: fix proxy initialization and setupCluster
2014-10-23 16:12:19 -07:00
Jonathan Boulle
d7301a5cf4
main: fix proxy initialization and setupCluster
2014-10-23 16:09:29 -07:00
Xiang Li
d8258c38be
Merge pull request #1374 from xiangli-cmu/cluster_on_peerurl
...
etcdserver: add member endpoint to peerurl
2014-10-23 16:08:45 -07:00
Jonathan Boulle
0eddf3db1f
Merge pull request #1375 from jonboulle/sort
...
etcdserver: sort Members() in Cluster
2014-10-23 16:01:29 -07:00
Jonathan Boulle
af42f4a56b
etcdserver: sort Members() in Cluster
2014-10-23 15:57:27 -07:00
Xiang Li
02551c277d
etcdserver: add member endpoint to peerurl
2014-10-23 15:55:00 -07:00
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
