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
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
Yicheng Qin
a45f0ede56
docs: add discovery protocol doc
...
This document talks about the technical details of discovery service
protocol. It helps users to learn about how discovery service works and
what behavior to expect.
2015-08-12 13:15:21 -07:00
Alex Polvi
7bd9d9aede
Merge pull request #3273 from polvi/kube-hack
...
add etcd on k8s example
2015-08-12 22:13:15 +03:00
Alex Polvi
cfb3522b63
add etcd on k8s example
2015-08-12 22:12:00 +03:00
Xiang Li
f468d8b51a
Merge pull request #3270 from xiang90/better_err
...
Better error message for etcdctl
2015-08-12 10:27:42 -07:00
Xiang Li
7e04a79fb4
etcdctl: print out better error information
2015-08-12 10:09:56 -07:00
Xiang Li
5d06d4ec44
client: print url as string
2015-08-12 10:09:40 -07:00
Xiang Li
e894756144
Merge pull request #3190 from yichengq/adjust-prop-timeout
...
etcdserver: adjust proposal timeout based on config
2015-08-12 09:41:25 -07:00
Yicheng Qin
c3d4d11402
etcdhttp: adjust request timeout based on config
...
It uses heartbeat interval and election timeout to estimate the
expected request timeout.
This PR helps etcd survive under high roundtrip-time environment,
e.g., globally-deployed cluster.
2015-08-12 09:22:59 -07:00
Xiang Li
18ecc297bc
Merge pull request #3254 from es-chow/log-group
...
set groupID in multinode as log context so it can be logged
2015-08-12 08:05:50 -07:00
es-chow
cc362ccdad
raft: set logger to raft so log context such as multinode groupID can be logged
2015-08-12 22:56:00 +08:00
Yicheng Qin
5a91937367
etcdserver: adjust commit timeout based on config
...
It uses heartbeat interval and election timeout to estimate the
commit timeout for internal requests.
This PR helps etcd survive under high roundtrip-time environment,
e.g., globally-deployed cluster.
2015-08-11 21:09:03 -07:00
Yicheng Qin
042afcf2a3
Merge pull request #3266 from yichengq/client-readme
...
client: clean up README
2015-08-11 16:21:13 -07:00
Yicheng Qin
7d618c46ad
client: clean up README
...
Address rob's comments about sentences in README.
2015-08-11 15:33:56 -07:00
Xiang Li
18a1c95f22
Merge pull request #3263 from xiang90/ctl_tr
...
etcdctl: add per request timeout
2015-08-11 14:17:12 -07:00
Yicheng Qin
dceacacd49
Merge pull request #3194 from yichengq/client-readme
...
client: add README
2015-08-11 13:35:54 -07:00
Xiang Li
e36c499d0f
etcdctl: add per request timeout
2015-08-11 13:33:50 -07:00
Yicheng Qin
8a7cf56e13
client: add README
...
It describes some basic usage and caveat of etcd/client package.
Write it together with Xiang.
2015-08-11 12:07:24 -07:00
Yicheng Qin
83efc08137
Merge pull request #3262 from yichengq/client-deadline
...
client: return context.DeadlineExceeded instead of ClusterError
2015-08-11 10:42:29 -07:00
Yicheng Qin
a1ef699aeb
client: return context.DeadlineExceeded instead of ClusterError
...
This is done to match user expectation to see context.DeadlineExceeded
when it reaches deadline.
2015-08-11 10:18:38 -07:00
Yicheng Qin
1fe52e1ec3
Merge pull request #3245 from yichengq/client_timeout
...
client: set timeout for each request
2015-08-11 10:10:42 -07:00
Yicheng Qin
f4c29a5f55
client: support to set timeout for each request
...
Add HeaderTimeout field in Config, so users could set timeout for each request.
Before this, one hanged request may block the call for long time. After
this, if the network is good, the user could set short timeout and expect
that API call can attempt next available endpoint quickly.
2015-08-11 10:01:05 -07:00
Xiang Li
a718329ad3
Merge pull request #3248 from xiang90/v3
...
initial v3 demo
2015-08-10 13:59:03 -07:00
Xiang Li
fb5e1ac548
Merge pull request #3256 from xiang90/update_log
...
update logger
2015-08-10 13:54:28 -07:00
Xiang Li
6c58333969
etcdmain: use default formatter
...
The default formatter would use syslog style when running
under init system, and would use pretty format otherwise.
2015-08-10 13:38:22 -07:00
Xiang Li
48e36bbb84
Godep: update capnslog dependency
2015-08-10 13:38:00 -07:00
Xiang Li
b0ea4ab3b1
doc: link to v3 api doc
2015-08-10 11:22:55 -07:00
Xiang Li
c32919e6d1
*: rename v3etcdctl to etcdctlv3
2015-08-10 11:21:37 -07:00
Xiang Li
c1e0b19f9f
*: better flag
2015-08-10 09:53:17 -07:00
Xiang Li
48b1cd54f3
Merge pull request #3243 from xiang90/conf
...
doc: add runtime reconfiguration design doc
2015-08-09 10:56:51 -07:00
Xiang Li
89bf5824c2
Merge pull request #3159 from sofuture/master
...
use /usr/bin/env to find bash
2015-08-09 10:56:12 -07:00
