Jonathan Boulle
7311a2a67d
Merge pull request #1321 from jonboulle/peers
...
main: correct peer-addr reference
2014-10-16 20:17:22 -07:00
Jonathan Boulle
bc7d372d5c
main: correct peer-addr reference
2014-10-16 20:06:26 -07:00
Jonathan Boulle
67368ac7fa
Merge pull request #1320 from jonboulle/proxy_doc
...
doc: add note about discovery proxy
2014-10-16 17:23:29 -07:00
Jonathan Boulle
2af0b2031f
doc: add note about discovery proxy
2014-10-16 17:14:38 -07:00
Jonathan Boulle
b7c42b0d76
Merge pull request #1314 from jonboulle/raft_tests
...
raft: remove unused compactThreshold
2014-10-16 17:11:55 -07:00
Jonathan Boulle
fc42bdb904
raft: remove unused compactThreshold
2014-10-16 17:11:10 -07:00
Jonathan Boulle
f7988e6069
Merge pull request #909 from jonboulle/proxy
...
Support corporate proxy via env var
2014-10-16 16:50:31 -07:00
Jonathan Boulle
3a29db1e9d
Merge pull request #1311 from jonboulle/remove_ttl
...
store: remove unused code
2014-10-16 16:35:01 -07:00
Yicheng Qin
7ef375efbd
Merge pull request #1317 from unihorn/169
...
etcdserver: fix data race in leaderStats.Followers
2014-10-16 16:24:26 -07:00
Yicheng Qin
782d91f2d9
etcdserver: fix data race in leaderStats.Followers
2014-10-16 16:18:53 -07:00
Yicheng Qin
074ddb5876
Merge pull request #1316 from unihorn/168
...
stats: fix data race when recording send result
2014-10-16 16:11:22 -07:00
Yicheng Qin
eb72bdc3d2
stats: fix data race when recording send result
2014-10-16 15:39:31 -07:00
Yicheng Qin
da2ee9a90c
Merge pull request #1312 from unihorn/165
...
etcdhttp: set stats field in peer handler
2014-10-16 14:47:57 -07:00
Yicheng Qin
8609acf573
etcdhttp: set stats field in peer handler
2014-10-16 14:23:09 -07:00
Jonathan Boulle
2cd6594485
store: remove unused code
2014-10-16 12:28:05 -07:00
Jonathan Boulle
7f8f371b0e
discovery: add ability to proxy discovery requests
2014-10-16 11:15:04 -07:00
Jonathan Boulle
6a30d3ba04
Merge pull request #1285 from jonboulle/stats_leader_followers
...
etcdserver: add StoreStats, ServerStats and LeaderStats
2014-10-16 10:44:48 -07:00
Jonathan Boulle
9b9e72e2a3
etcdhttp: add tests for ServeStats/ServeLeader
2014-10-16 10:43:49 -07:00
Jonathan Boulle
97ae531eda
etcdserver: split out storestats and serverstats
2014-10-16 10:43:49 -07:00
Jonathan Boulle
fedb67a71a
etcdserver: fix TODO and change to base 16
2014-10-16 10:43:49 -07:00
Jonathan Boulle
8168fed825
etcdserver: add ServerStats and LeaderStats
...
This adds the remaining two stats endpoints: `/v2/stats/self`, for
various statistics on the EtcdServer, and `/v2/stats/leader`, for
statistics on a leader's followers.
By and large most of the stats code is copied across from 0.4.x, updated
where necessary to integrate with the new decoupling of raft from
transport.
This does not satisfactorily resolve the question of name vs ID. In the
old world, names were unique in the cluster and transmitted over the
wire, so they could be used safely in all statistics. In the new world,
a given EtcdServer only knows its own name, and it is instead IDs that
are communicated among the cluster members. Hence in most places here we
simply substitute a string-encoded ID in place of name, and only where
possible do we retain the actual given name of the EtcdServer.
2014-10-16 10:43:44 -07:00
Jonathan Boulle
0a8721a708
etcdserver: expose store statistics
2014-10-16 10:43:23 -07:00
Yicheng Qin
79e9f2ab81
Merge pull request #1296 from unihorn/161
...
etcdserver: add checking when apply conf change
2014-10-16 09:58:51 -07:00
Yicheng Qin
8cd6030a1d
etcdserver: add checking when apply conf change
2014-10-16 09:49:26 -07:00
Xiang Li
82476e04f0
Merge pull request #1303 from coreos/datadir
...
main: use node name as default dir
2014-10-16 21:31:18 +08:00
Xiang Li
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
Jonathan Boulle
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
Jonathan Boulle
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
Yicheng Qin
eb2dd1892f
raft: add RemovedNodes to SoftState
2014-10-15 10:53:07 -07:00
Yicheng Qin
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
Xiang Li
f62d4908b0
Merge pull request #1304 from coreos/logging
...
etcdserver: better logging
2014-10-15 13:36:32 +08:00
Xiang Li
828accf07b
etcdserver: better logging
2014-10-15 13:07:34 +08:00
Yicheng Qin
6d0658c8ca
etcdhttp: check error returned by ParseForm
2014-10-14 14:50:11 -07:00
Jonathan Boulle
48c195fac7
Merge pull request #1298 from jonboulle/members
...
etcdhttp: remove members handling for now
2014-10-14 13:57:52 -07:00
Jonathan Boulle
7656069675
etcdhttp: remove members handling for now
2014-10-14 12:07:28 -07:00
Yicheng Qin
99e35554c0
etcdhttp: add doc for member management http endpoint
2014-10-14 11:09:14 -07:00
Xiang Li
b0fcd680f8
Merge pull request #1287 from coreos/refactor
...
*: proto refactoring
2014-10-15 01:51:44 +08:00
Xiang Li
f98fbbfc14
*: proto refactoring
2014-10-14 21:07:23 +08:00
Brandon Philips
2b03d35ab9
Merge pull request #1300 from jonboulle/godep
...
*: move from third_party to Godep
2014-10-14 01:03:58 -07:00
Jonathan Boulle
4183b69e12
*: move from third_party to Godep
2014-10-14 00:37:52 -07:00
Yicheng Qin
31264e7eb5
etcdhttp: add PUT and DELETE on /v2/admin/members/
2014-10-13 22:36:06 -07:00
Xiang Li
09f9884c6a
Merge pull request #1288 from coreos/cleanup
...
etcdserver: clean NewServer
2014-10-14 11:32:13 +08:00
Xiang Li
fbb874172c
etcdserver: fix typo
2014-10-14 11:30:49 +08:00
Xiang Li
6fc0b1977b
etcdserver: Id -> ID
2014-10-14 11:30:49 +08:00
Xiang Li
b53b74733a
etcdserver: add s.apply
2014-10-14 11:30:49 +08:00
Xiang Li
30c7a7f2dd
etcdserver: add shouldDiscover
2014-10-14 11:29:00 +08:00
Xiang Li
a85ec90d68
etcdserver: clean NewServer
2014-10-14 11:29:00 +08:00
Xiang Li
57ae19b500
Merge pull request #1290 from coreos/member_endpoint
...
etcdserver: change machines endpoint to members
2014-10-14 11:04:08 +08:00
Xiang Li
1177b07535
etcdserver: change machines endpoint to members
2014-10-14 11:02:17 +08:00
Xiang Li
d7dfe07e5d
Merge pull request #1293 from unihorn/160
...
raft: protobuf messageType
2014-10-14 09:16:38 +08:00
