Commit Graph

3340 Commits

Author SHA1 Message Date
69842b344d etcdctl: reflect build script location in README.md 2014-10-22 17:52:40 -07:00
52e08720b7 etcdctl: remove build indicator from README.md 2014-10-22 17:52:40 -07:00
29ef918808 etcdctl: import from external repo 2014-10-22 17:52:40 -07:00
9f2a42bf7d godep: add deps for etcdctl 2014-10-22 17:52:40 -07:00
9af5b74a8d gitignore: be more specific when ignoring /etcd 2014-10-22 17:52:40 -07:00
46be5d7d5f version: move version string into new package 2014-10-22 17:52:40 -07:00
63fa2a626a etcdserver: admin PUT returns the json representation of the newly created member 2014-10-22 17:19:28 -07:00
712a05be83 Merge pull request #1357 from coreos/accept_json
etcdserver: admin endpoint accepts json body
2014-10-22 16:30:22 -07:00
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
7be0f4b618 etcdserver: admin endpoint accepts json body 2014-10-22 16:19:48 -07:00
ec7af4f519 Merge pull request #1359 from philips/fix-mismatch-error
etcdserver: fixup mismatch error line
2014-10-22 15:55:41 -07:00
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
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
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
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
e42d65da12 etcdserver: Check the initial cluster settings after checking if the WAL exists 2014-10-22 18:16:43 -04:00
d27d308935 Merge pull request #1356 from coreos/fix_dis
main: use our own flagset in setupCluster
2014-10-22 14:55:40 -07:00
5444a366da main: use our own flagset in setupCluster 2014-10-22 14:51:51 -07:00
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
6d9eb57555 etcdhttp: test bad url for POST on admin endopint 2014-10-22 14:27:08 -07:00
d6a5dc9e61 Merge pull request #1352 from coreos/fix_main
main: fix default case
2014-10-22 14:05:11 -07:00
ca4f12182a main: fix default case 2014-10-22 13:49:52 -07:00
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
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
829cec8ccf Merge stylistic comments 2014-10-22 14:26:05 -04:00
6b32395637 Merge pull request #1343 from unihorn/175
etcdserver: record removed member to check incoming message
2014-10-22 11:16:55 -07:00
5014558b00 etcdserver: clean code 2014-10-22 11:09:36 -07:00
3162ead7b1 etcdhttp: do message statistics only on valid ones 2014-10-22 11:09:36 -07:00
9ad4a8e33a etcdserver: add isKeyNotFound helper func 2014-10-22 11:09:36 -07:00
89b032cd69 etcdserver: Member.storeKey -> memberStoreKey 2014-10-22 11:09:36 -07:00
7498234e40 etcdserver: record removed member to check incoming message 2014-10-22 11:09:35 -07:00
b40d30a8d2 Merge pull request #1346 from unihorn/178
integration: fix master
2014-10-22 11:09:06 -07:00
c5d1fcd70a fix wrong name 2014-10-22 13:58:43 -04:00
cb5a638c44 style comments 2014-10-22 13:52:42 -04:00
52dedab7b4 Move setupCluster inside startEtcd 2014-10-22 13:52:42 -04:00
502a3c2460 Refactor Cluster to hold and add members. 2014-10-22 13:52:42 -04:00
1347e3952f docs and cluster ID change based on name 2014-10-22 13:52:42 -04:00
ad0b7b7dbb Add cluster name to etcd flags 2014-10-22 13:52:42 -04:00
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
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
4f52d371c1 integration: skip TestGoroutinesRunning 2014-10-22 10:10:43 -07:00
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
48992cced3 Merge pull request #1344 from unihorn/176
integration: add remaining goroutine check
2014-10-21 18:05:28 -07:00
f356648252 integration: add remaining goroutine check 2014-10-21 16:59:14 -07:00
f26bb6ad44 Merge pull request #1335 from unihorn/174
etcdserver/etcdhttp: store location adjustment
2014-10-21 16:24:30 -07:00
06b196e345 etcdhttp: writeEvent -> writeKeyEvent 2014-10-21 16:10:49 -07:00
ca73f25615 etcdhttp: parseRequest -> parseKeyRequest 2014-10-21 16:10:49 -07:00
e2b6a4fc4c etcdserver: const XXXDir -> StoreXXXPrefix
and code clean
2014-10-21 16:10:49 -07:00
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
0398a31b16 Merge pull request #1339 from coreos/checkcid
etcdserver: checking clusterID
2014-10-21 16:00:49 -07:00