Yicheng Qin
e77f8e311c
etcdserver: parse context error for better message
2014-10-27 10:59:15 -07:00
Brandon Philips
91a4aa151a
Merge pull request #1406 from bcwaldon/doc-clustering
...
doc: PUT instead of POST discovery config
2014-10-24 16:36:54 -07:00
Brian Waldon
b62fdac193
doc: PUT instead of POST discovery config
2014-10-24 16:30:48 -07:00
Jonathan Boulle
e630910e31
Merge pull request #1398 from jonboulle/proxy
...
proxy not working on master
2014-10-24 15:55:31 -07:00
Yicheng Qin
338f59db74
Merge pull request #1401 from unihorn/186
...
etcdhttp: parse quorum field from http request
2014-10-24 15:54:40 -07:00
Jonathan Boulle
719c57a29d
proxy: retrieve ClientURLs from cluster
...
This is a simple solution to having the proxy keep up to date with the
state of the cluster. Basically, it uses the cluster configuration
provided at start up (i.e. with `-initial-cluster-state`) to determine
where to reach peer(s) in the cluster, and then it will periodically hit
the `/members` endpoint of those peer(s) (using the same mechanism that
`-cluster-state=existing` does to initialise) to update the set of valid
client URLs to proxy to.
This does not address discovery (#1376 ), and it would probably be better
to update the set of proxyURLs dynamically whenever we fetch the new
state of the cluster; but it needs a bit more thinking to have this done
in a clean way with the proxy interface.
Example in Procfile works again.
2014-10-24 15:54:12 -07:00
Yicheng Qin
0e1d1646fd
etcdhttp: parse quorum field from http request
2014-10-24 15:44:39 -07:00
Brandon Philips
0fcb59e7d9
Merge pull request #1393 from philips/0.5-docs2
...
Documentation/0.5: add api.md
2014-10-24 15:18:59 -07:00
Brandon Philips
5456ef7049
Documentation/0.5: add api.md
...
- Update all of the ports to use the new IANA port numbers
- Update the stats section to talk about the id fields
- Remove mention of the modules
- Remove -L from all of the curl commands since it is no longer needed
- Point people at the clustering.md guide for the cluster APIs
2014-10-24 15:18:47 -07:00
Yicheng Qin
cb59a46576
Merge pull request #1396 from unihorn/185
...
etcdhttp: trim StoreKeysPrefix from error in serveKeys
2014-10-24 14:48:31 -07:00
Jonathan Boulle
46528ee17b
Merge pull request #1391 from jonboulle/version
...
/version is 404 now
2014-10-24 14:48:02 -07:00
Jonathan Boulle
9a465b9cf5
etcdhttp: add /version endpoint
2014-10-24 14:47:37 -07:00
Jonathan Boulle
dc46d40b8e
Merge pull request #1397 from jonboulle/log_raft_msg
...
etcdserver/etcdhttp: remove log message for every received raft
2014-10-24 14:29:38 -07:00
Jonathan Boulle
bac13b5cb2
etcdserver/etcdhttp: remove log message for every received raft
2014-10-24 14:25:20 -07:00
Yicheng Qin
34dcbb4679
etcdhttp: trim StoreKeysPrefix from error in serveKeys
...
It returns error messaage like this now:
'{"errorCode":100,"message":"Key not found","cause":"/1/pants","index":10}'
The commit trims '/1' prefix from cause field if exists.
This is a hack to make it display well. It is correct because all error causes
that contain Path puts Path at the head of the string.
2014-10-24 14:12:53 -07:00
Xiang Li
030aed8205
Merge pull request #1394 from xiangli-cmu/initial-advertise-peer-urls
...
*: change advertise-peer-urls -> initial-advertise-peer-urls
2014-10-24 14:08:25 -07:00
Xiang Li
2e84eb3c36
*: change advertise-peer-urls -> initial-advertise-peer-urls
2014-10-24 13:51:59 -07:00
Brian Waldon
9a38be297c
Merge pull request #1380 from bcwaldon/client-keys-API
...
Break apart KeysAPI
2014-10-24 13:48:12 -07:00
Brian Waldon
f21d93ba60
client: define DefaultRequestTimeout
2014-10-24 13:28:04 -07:00
Brian Waldon
45d8fbdcda
client: move discovery path logic into client pkg
2014-10-24 13:28:04 -07:00
Brian Waldon
ce4df96e69
client: break apart KeysAPI from httpClient
2014-10-24 13:27:59 -07:00
Jonathan Boulle
d7f9228133
Merge pull request #1381 from jonboulle/members
...
/v2/admin/members API should use JSON containers in response
2014-10-24 13:20:10 -07:00
Yicheng Qin
49a68adcf1
Merge pull request #1386 from unihorn/184
...
etcdserver: update member attribute when apply request
2014-10-24 12:46:11 -07:00
Yicheng Qin
ea0bff80c0
etcdserver: update member attribute when apply request
2014-10-24 12:43:53 -07:00
Yicheng Qin
d1b57b448d
Merge pull request #1383 from unihorn/183
...
etcdserver: support newly-join member bootstrap
2014-10-24 12:43:25 -07:00
Yicheng Qin
08593bcdf6
etcdserver: support newly-join member bootstrap
2014-10-24 12:38:44 -07:00
Xiang Li
9fb02eb6fa
Merge pull request #1387 from xiangli-cmu/fix_raft
...
Fix raft
2014-10-24 12:10:54 -07:00
Jonathan Boulle
543e12074a
etcdserver/member: change JSON fields to lowerCamelCase
2014-10-24 12:03:17 -07:00
Jonathan Boulle
14852662ef
etcdhttp: rename Members -> members in JSON, update doc
2014-10-24 12:03:17 -07:00
Jonathan Boulle
7ef468b315
etcdhttp: remove /v2/admin/members/x serving
2014-10-24 12:03:17 -07:00
Jonathan Boulle
9b679de9dd
etcdserver/etcdhttp: use container for admin/members endpoint
2014-10-24 12:03:17 -07:00
Brian Waldon
c8634428fa
Merge pull request #1364 from bcwaldon/import-etcdctl
...
Import etcdctl
2014-10-24 12:02:41 -07:00
Xiang Li
507300130b
raft: add tests for ignoring heartbeat reply
2014-10-24 11:50:21 -07:00
Xiang Li
e081ad7298
Merge pull request #1368 from xiangli-cmu/doc
...
doc: add admin api doc
2014-10-24 10:42:14 -07:00
Jonathan Boulle
85800fd8f6
Merge pull request #1385 from jonboulle/config
...
etcdserver: fix + expand config tests
2014-10-24 10:10:07 -07:00
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
