Yicheng Qin
927d5f3d26
Merge pull request #3301 from yichengq/ca-file
...
etcdmain: update -ca-file description
2015-08-17 23:36:33 -07:00
Yicheng Qin
c0747a7b8b
etcdmain: update -ca-file description
...
so people could deprecate old flags and use new flags much easier.
2015-08-17 22:36:04 -07:00
Yicheng Qin
bcb4d5d53e
Merge pull request #3311 from yichengq/request-timeout
...
extend hardcoded timeout for globally-deployed etcd cluster
2015-08-17 17:00:24 -07:00
Xiang Li
dfc6b4436f
Merge pull request #3315 from xiang90/key_err
...
etcdhttp:write etcderror for all errors in keyhandler
2015-08-17 16:54:12 -07:00
Yicheng Qin
ffae601af5
etcdmain: calculate dial timeout for peer transport
...
This helps peer communication in globally-deployed cluster.
2015-08-17 16:52:53 -07:00
Yicheng Qin
1375ef8985
etcdserver: remove getVersion timeout
...
The request can still time out because we have set dial timeout and
read/write timeout. It increases timeout expectation from 1s to 5s,
but it makes it workable in globally-deployer cluster.
2015-08-17 16:50:40 -07:00
Xiang Li
c7fbc01ef1
Merge pull request #3314 from sebschrader/proxy-loop
...
Warn about proxy loops with incorrect advertise-client-urls
2015-08-17 16:04:00 -07:00
Xiang Li
d487cf6b63
etcdhttp:write etcderror for all errors in keyhandler
2015-08-17 15:51:29 -07:00
Sebastian Schrader
f70950ff93
docs: warn about proxy loops with incorrect advertise-client-urls
2015-08-18 00:42:48 +02:00
Yicheng Qin
c530385d6d
Merge pull request #3313 from yichengq/internal-timeout
...
etcdserver: use ReqTimeout only
2015-08-17 15:05:46 -07:00
Xiang Li
af6d1d3d95
Merge pull request #3310 from xiang90/http_err
...
*: key handler should write auth error as etcd error
2015-08-17 14:57:19 -07:00
Yicheng Qin
2d5b95c49f
etcdserver: use ReqTimeout only
...
We cannot refer RTT value from heartbeat interval, so CommitTimeout
is invalid. Remove it and use ReqTimeout instead.
2015-08-17 14:54:25 -07:00
Xiang Li
87f061bab2
*: key handler should write auth error as etcd error
2015-08-17 14:45:45 -07:00
Xiang Li
ba3a9b5f92
Merge pull request #3309 from xiang90/enforce
...
etcdserver: add version enforcement when setting cluster version
2015-08-17 12:41:04 -07:00
Xiang Li
15e03d801f
etcdserver: add version enforcement when setting cluster version
2015-08-17 11:12:39 -07:00
Xiang Li
f615f9a999
Merge pull request #3305 from xiang90/c_v
...
*: only print out major.minor version for cluster version
2015-08-17 09:40:01 -07:00
Xiang Li
d95c7d8a94
Merge pull request #3307 from ian-kelling/master
...
documentation: fix misspelled word
2015-08-15 18:53:58 -07:00
Ian Kelling
8dd44465c3
documentation: fix misspelled word
2015-08-15 17:56:17 -07:00
Xiang Li
f199a484af
*: only print out major.minor version for cluster version
2015-08-15 08:30:06 -07:00
Xiang Li
bbcb38189c
Merge pull request #3302 from xiang90/v
...
etcdserver: better version detection log output
2015-08-14 16:14:55 -07:00
Xiang Li
0076ab154b
etcdserver: better version detection log output
...
Fix https://github.com/coreos/etcd/issues/3288
2015-08-14 16:08:33 -07:00
Xiang Li
dd56b7e05e
Merge pull request #3299 from xiang90/txn
...
initial support for txn
2015-08-14 16:05:16 -07:00
Xiang Li
5cd109949a
etcdctl: support txn
2015-08-14 15:58:38 -07:00
Xiang Li
9233fff48f
etcdserver: support txn
2015-08-14 11:45:31 -07:00
Xiang Li
46865fa5a5
etcdserverpb: update proto
2015-08-14 11:45:07 -07:00
Yicheng Qin
d448593bbc
Merge pull request #3295 from yichengq/err-example
...
client: fix clusterError typo in README
2015-08-14 09:35:31 -07:00
Yicheng Qin
5eed141d54
client: fix clusterError typo in README
...
It helps users to use client better.
2015-08-13 16:38:41 -07:00
Yicheng Qin
fefb273389
*: bump to v2.2.0-alpha.1+git
2015-08-13 16:01:31 -07:00
Yicheng Qin
201bb4b3d8
*: bump to v2.2.0-alpha.1
2015-08-13 16:01:09 -07:00
Yicheng Qin
3cc4957d98
Merge pull request #3293 from yichengq/improve-err
...
etcdserver: improve error message when timeout due to leader fail
2015-08-13 15:58:48 -07:00
Yicheng Qin
c229e6e655
etcdserver: improve error message when timeout due to leader fail
2015-08-13 15:46:21 -07:00
Yicheng Qin
394894e03e
Merge pull request #3291 from yichengq/auth-cap
...
etcdhttp: add auth capability in 2.2
2015-08-13 15:01:59 -07:00
Yicheng Qin
ceb27b1c48
etcdhttp: add auth capability in 2.2
2015-08-13 14:49:10 -07:00
Yicheng Qin
a17288558e
Merge pull request #3289 from yichengq/marshal
...
etcdserver: go back to marshal request in 2.1 way
2015-08-13 14:20:24 -07:00
Yicheng Qin
334bdd1c26
Merge pull request #3153 from gtank/tls-setup
...
hack: TLS setup using cfssl
2015-08-13 13:53:14 -07:00
Xiang Li
959feb70d1
Merge pull request #3275 from xiang90/sort
...
improve in order key generation
2015-08-13 13:51:19 -07:00
Xiang Li
a7b9bff939
store: add 0 as padding for better lexicographic sorting.
2015-08-13 13:42:37 -07:00
Yicheng Qin
0fdb77aea2
etcdserver: go back to marshal request in 2.1 way
...
It fixes the problem that 2.1 cannot roll upgrade to 2.2 smoothly
because 2.1 cannot understand the bytes marshalled at 2.2.
2015-08-13 13:41:52 -07:00
Yicheng Qin
003d096138
Merge pull request #3286 from yichengq/fit-2.2
...
*: update MinClusterVersion and supportedStream map
2015-08-13 13:31:37 -07:00
Yicheng Qin
c9cca6a93b
*: update MinClusterVersion and supportedStream map
2015-08-13 13:05:14 -07:00
Xiang Li
846b1fdbcd
Merge pull request #3287 from xiang90/update_roadmap
...
Update roadmap
2015-08-13 13:00:01 -07:00
Xiang Li
329647ab62
roadmap: update roadmap
2015-08-13 12:56:23 -07:00
Xiang Li
6a64051245
roadmap: remove 2.1 milestone
2015-08-13 12:51:58 -07:00
Yicheng Qin
80005af5b2
Merge pull request #3285 from yichengq/bump-capnslog
...
godeps: bump capnslog to 42a8c3b1a6f917bb8346ef738f32712a7ca0ede7
2015-08-13 11:49:38 -07:00
Yicheng Qin
d66ede7186
godeps: bump capnslog to 42a8c3b1a6f917bb8346ef738f32712a7ca0ede7
2015-08-13 11:32:45 -07:00
Yicheng Qin
a46943548a
*: bump to v2.2.0-alpha.0+git
2015-08-13 10:21:36 -07:00
Yicheng Qin
ab5a69cb18
*: bump to v2.2.0-alpha.0
2015-08-13 10:20:05 -07:00
Yicheng Qin
976ce93539
Merge pull request #3277 from yichengq/better-log
...
etcdserver: specify timeout caused by leader election
2015-08-12 17:02:27 -07:00
Yicheng Qin
27170e67b9
etcdserver: specify timeout caused by leader election
...
Before this PR, the timeout caused by leader election returns:
```
14:45:37 etcd2 | 2015-08-12 14:45:37.786349 E | etcdhttp: got unexpected
response error (etcdserver: request timed out)
```
After this PR:
```
15:52:54 etcd1 | 2015-08-12 15:52:54.389523 E | etcdhttp: etcdserver:
request timed out, possibly due to leader down
```
2015-08-12 16:53:18 -07:00
Xiang Li
ddfe343e77
Merge pull request #3271 from yichengq/doc-discovery
...
docs: add discovery protocol doc
2015-08-12 13:51:32 -07:00
