Commit Graph

3364 Commits

Author SHA1 Message Date
79e9f2ab81 Merge pull request #1296 from unihorn/161
etcdserver: add checking when apply conf change
2014-10-16 09:58:51 -07:00
8cd6030a1d etcdserver: add checking when apply conf change 2014-10-16 09:49:26 -07:00
82476e04f0 Merge pull request #1303 from coreos/datadir
main: use node name as default dir
2014-10-16 21:31:18 +08:00
efba919a93 main: use node name as default dir
We use nodeID as the default dir previously. It works fine before we do dynamic nodeID
generation (introducing time). After the change the dynamic nodeID will change every
time we restart the etcd process. If the user does not provide the data dir, the default
dir will change every time. It is not the desired behavior.

In this commit, we change the default data dir to node name. If the user changes the node
name and does provide the data dir, etcd still cannot recover from previous state. But it
is much better than using nodeID. And it is actually a doucmentation issue.

Conflicts:
	main.go
2014-10-16 21:22:12 +08:00
c18acd7d6f Merge pull request #1306 from jonboulle/tls
pkg: set minimum TLS version to 1.0 (disable SSL3)
2014-10-15 14:02:05 -07:00
e334148a91 pkg: set minimum TLS version to 1.0 (disable SSL3)
SSLv3 is no longer considered secure, and is not supported by golang
clients. Set the minimum version of all TLSConfigs that etcd uses to
ensure that only TLS >=1.0 can be used.
2014-10-15 14:00:16 -07:00
eb2dd1892f raft: add RemovedNodes to SoftState 2014-10-15 10:53:07 -07:00
a8a1d4fd93 Merge pull request #1299 from unihorn/162
etcdhttp: add PUT and DELETE on /v2/admin/members/
2014-10-15 10:52:11 -07:00
f62d4908b0 Merge pull request #1304 from coreos/logging
etcdserver: better logging
2014-10-15 13:36:32 +08:00
828accf07b etcdserver: better logging 2014-10-15 13:07:34 +08:00
6d0658c8ca etcdhttp: check error returned by ParseForm 2014-10-14 14:50:11 -07:00
48c195fac7 Merge pull request #1298 from jonboulle/members
etcdhttp: remove members handling for now
2014-10-14 13:57:52 -07:00
7656069675 etcdhttp: remove members handling for now 2014-10-14 12:07:28 -07:00
99e35554c0 etcdhttp: add doc for member management http endpoint 2014-10-14 11:09:14 -07:00
b0fcd680f8 Merge pull request #1287 from coreos/refactor
*: proto refactoring
2014-10-15 01:51:44 +08:00
f98fbbfc14 *: proto refactoring 2014-10-14 21:07:23 +08:00
2b03d35ab9 Merge pull request #1300 from jonboulle/godep
*: move from third_party to Godep
2014-10-14 01:03:58 -07:00
4183b69e12 *: move from third_party to Godep 2014-10-14 00:37:52 -07:00
31264e7eb5 etcdhttp: add PUT and DELETE on /v2/admin/members/ 2014-10-13 22:36:06 -07:00
09f9884c6a Merge pull request #1288 from coreos/cleanup
etcdserver: clean NewServer
2014-10-14 11:32:13 +08:00
fbb874172c etcdserver: fix typo 2014-10-14 11:30:49 +08:00
6fc0b1977b etcdserver: Id -> ID 2014-10-14 11:30:49 +08:00
b53b74733a etcdserver: add s.apply 2014-10-14 11:30:49 +08:00
30c7a7f2dd etcdserver: add shouldDiscover 2014-10-14 11:29:00 +08:00
a85ec90d68 etcdserver: clean NewServer 2014-10-14 11:29:00 +08:00
57ae19b500 Merge pull request #1290 from coreos/member_endpoint
etcdserver: change machines endpoint to members
2014-10-14 11:04:08 +08:00
1177b07535 etcdserver: change machines endpoint to members 2014-10-14 11:02:17 +08:00
d7dfe07e5d Merge pull request #1293 from unihorn/160
raft: protobuf messageType
2014-10-14 09:16:38 +08:00
9722aac10d Merge pull request #1295 from jonboulle/typos
main: fix typos and initial-cluster references
2014-10-13 15:16:21 -07:00
a6dfde85e4 main: fix typos and initial-cluster references 2014-10-13 14:52:49 -07:00
85c2d852f3 Merge pull request #1259 from unihorn/156
etcdserver/raft: apply bootstrap addnode entries
2014-10-13 12:18:43 -07:00
f693c6ddf2 etcdserver: apply bootstrap conf change 2014-10-13 11:22:23 -07:00
0319b033ea etcdserver/raft: set context for bootstrap addnode entries 2014-10-13 11:22:23 -07:00
32c38820c1 raft: protobuf messageType 2014-10-13 11:13:43 -07:00
d06d55193b doc: fix listing a directory 2014-10-13 10:59:24 -07:00
b8b4852ec9 Merge pull request #972 from tazjin/etcd-security-docs
Documentation: Clarify etcd security documentation
2014-10-13 08:55:12 -07:00
6ffaa4db5d Merge pull request #1289 from coreos/uint
*: change all ID to uint64
2014-10-12 13:58:43 +08:00
3516cc3ee5 *: change all ID to uint64 2014-10-12 08:38:48 +08:00
f16a272898 Merge pull request #1234 from unihorn/152
etcdserver: save PeerURLs and Others into two different keys
2014-10-10 12:21:32 -07:00
f8b338d423 Merge pull request #1236 from unihorn/153
wal: record node id at the head of WAL file
2014-10-10 12:09:17 -07:00
447caf1afc etcdserver/wal: record info at the head of WAL file 2014-10-10 11:57:09 -07:00
181cbbdfe0 Merge pull request #1280 from RichardHightower/patch-2
Update clients-matrix.md
2014-10-10 10:05:26 -07:00
d241275518 Merge pull request #1275 from RichardHightower/patch-1
Update libraries-and-tools.md
2014-10-10 09:58:32 -07:00
2ec999ab3b Update clients-matrix.md 2014-10-10 02:03:35 -07:00
77271b0663 etcdserver: split Member into RaftAttributes and Attributes
The split helps to save them in different key paths, because they have
distinct life cycle on update.
2014-10-09 20:28:00 -07:00
74ab003e1f Merge pull request #1256 from barakmich/retry
Add logging and backoff and simple retry logic
2014-10-09 13:24:14 -04:00
5e7267a751 last comment 2014-10-09 13:16:45 -04:00
3e5073e9be Merge pull request #1261 from coreos/uint
raft: int64 -> uint64
2014-10-09 14:47:03 +08:00
1eb1020717 raft: fix raft test 2014-10-09 14:42:29 +08:00
8bbbaa88b2 *: raft related int64 -> uint64 2014-10-09 14:29:21 +08:00