Xiang Li
243fe519a9
Merge pull request #3435 from xiang90/gogoproto
...
*: update gogoproto
2015-09-03 15:35:48 -07:00
Xiang Li
ef7cf058a2
*: update gogoproto
2015-09-03 15:32:25 -07:00
Xiang Li
ae2b43b588
Merge pull request #3433 from tamird/proto-import-path
...
*: regenerate proto to use local import path
2015-09-03 10:52:37 -07:00
Tamir Duberstein
45390b9fb8
*: regenerate proto to use local import path
...
Using Go-style import paths in protos is not idiomatic. Normally, this
detail would be internal to etcd, but the path from which gogoproto
is imported affects downstream consumers (e.g. cockroachdb).
In cockroach, we want to avoid including `$GOPATH/src` in our protoc
include path for various reasons. This patch puts etcd on the same
convention, which allows this for cockroach.
More information: https://github.com/cockroachdb/cockroach/pull/2339#discussion_r38663417
This commit also regenerates all the protos, which seem to have
drifted a tiny bit.
2015-09-03 13:38:28 -04:00
Xiang Li
84d1527df6
Merge pull request #3432 from coreos/robszumski-patch-1
...
docs: insert whitespace
2015-09-03 09:56:57 -07:00
Rob Szumski
49e7e6eb9f
docs: insert whitespace
...
Fixes the rendering of this page on https://coreos.com/etcd/docs/2.1.0/proxy.html
2015-09-03 09:50:07 -07:00
Yicheng Qin
1eaf169057
Merge pull request #3395 from yichengq/backend-test
...
storage/backend: add unit tests for backend and batchTx
2015-09-03 07:23:38 -07:00
Yicheng Qin
44fd734038
storage/backend: add unit tests for backend and batchTx
2015-09-02 16:57:13 -07:00
Yicheng Qin
16e9e4b3d5
Merge pull request #3412 from yichengq/etcdctl-sync
...
etcdctl: better logging for sync process
2015-09-02 16:49:00 -07:00
Yicheng Qin
8e040efed9
etcdctl: log more about sync process
...
Users don't even know that etcdctl is doing sync and fails on sync
process. So we add more logs for sync process.
2015-09-02 16:10:25 -07:00
Yicheng Qin
3a8db488ca
Merge pull request #3415 from yichengq/better-err
...
etcdctl/command: print more details about ErrNoEndpoint
2015-09-02 10:11:45 -07:00
Yicheng Qin
41cc16481f
Merge pull request #3418 from AdoHe/fix_build_script_error
...
build: fix build error on ubuntu
2015-09-01 22:44:23 -07:00
Tony
9665cda7c1
build: fix build error on ubuntu
2015-09-02 13:28:55 +08:00
Xiang Li
484a115813
Merge pull request #3424 from akolb1/bolt_solaris1
...
Godeps: boltdb dependency missing solaris support
2015-09-01 16:19:23 -07:00
Alex Kolbasov
ecbc44fb63
Godeps: boltdb dependency missing solaris support
2015-09-01 23:17:36 +00:00
Yicheng Qin
423e3bbbd8
etcdctl/cluster_health: provide better message for empty client urls
...
It skips sync when init client, and prints out unreachable messagen and
points to notice when checking health of etcd members one by one.
2015-09-01 14:42:19 -07:00
Yicheng Qin
aa0c8fea55
Merge pull request #3321 from yichengq/doc-tls-setup
...
docs/security: link cfssl example
2015-09-01 14:28:40 -07:00
Yicheng Qin
6caae58814
docs/security: recommend cfssl instead of etcd-ca
...
This provides a more general and stable way for users to set TLS cluster.
2015-09-01 14:07:26 -07:00
Yicheng Qin
d412eaa3a2
Merge pull request #3308 from yichengq/go-codec
...
Use ugorji codec for unmarshalling key responses in client
2015-09-01 14:04:38 -07:00
Xiang Li
53b8175d3f
Merge pull request #3421 from xiang90/3411
...
etcdmain: proxy does not need to belong to the discovered cluster
2015-09-01 13:49:31 -07:00
Xiang Li
7957677cf2
etcdmain: proxy does not need to belong to the discovered cluster
2015-09-01 11:24:02 -07:00
Xiang Li
a94118893c
Merge pull request #3413 from xiang90/snapshot_dir
...
*: support wal dir
2015-09-01 10:03:50 -07:00
Xiang Li
d94e712d91
*: support wal dir
2015-09-01 09:54:27 -07:00
Yicheng Qin
85b6c51a23
Merge pull request #3420 from yichengq/wait-more
...
storage: extend timeout to wait for put complete
2015-09-01 09:25:46 -07:00
Yicheng Qin
a21166c3aa
storage: extend timeout to wait for put complete
...
travis is sometimes slow, and it could fail to complete the put in 10ms.
2015-09-01 09:03:03 -07:00
Yicheng Qin
8ac981e1ee
Merge pull request #3416 from yichengq/get-cluster-timeout
...
etcdserver: add timeout param on getClusterFromRemotePeers
2015-09-01 09:00:19 -07:00
Yicheng Qin
f3bfcb9dee
etcdserver: add timeout param on getClusterFromRemotePeers
...
It sets 10s timeout for public GetClusterFromRemotePeers.
This helps the following cases to work well in high latency scenario:
1. proxy sync members from the cluster
2. newly-joined member sync members from the cluster
Besides 10s request timeout, the request is also controlled by dial
timeout and read connection timeout.
2015-09-01 08:49:01 -07:00
Yicheng Qin
1fabc48968
Merge pull request #3404 from bdarnell/multinode-propose-panic
...
raft: A removed node can no longer be leader.
2015-08-31 20:06:34 -07:00
Ben Darnell
4f20e01f60
raft: Ignore proposals if not a current member.
...
Fixes another panic in MultiNode.Propose.
2015-08-31 20:31:14 -04:00
Yicheng Qin
c2caa4ae3b
etcdctl/command: print more details about ErrNoEndpoint
...
This commit prints more details if getting ErrNoEndpoint when sync with
cluster. This helps users to know what happens.
2015-08-31 16:28:43 -07:00
Yicheng Qin
4b9b0cbcc1
storage: add newBackend and newBatchTx
...
This is for ease of testing.
2015-08-31 13:25:10 -07:00
Xiang Li
57b39aca4e
Merge pull request #3403 from xiang90/doc
...
doc: add 0.4.9 to 2.2 migration guide
2015-08-31 11:28:25 -07:00
Xiang Li
3c1f80bdff
Merge pull request #3401 from xiang90/more_metrics
...
more on storage metrics
2015-08-31 09:55:29 -07:00
Xiang Li
406bb6749e
doc: add 0.4.9 to 2.2 migration guide
2015-08-31 09:55:12 -07:00
Xiang Li
bc71aab07a
Merge pull request #3409 from xiang90/fix_force_new
...
etcdserver: ignore confChangeUpdateNode in getIDs
2015-08-31 09:44:10 -07:00
Xiang Li
1bcaa9f4a1
etcdserver: ignore confChangeUpdateNode in getIDs
2015-08-31 09:36:39 -07:00
Xiang Li
aaa7dfc14d
Merge pull request #3407 from MSamman/fix-build-warning
...
build: fixed build warning
2015-08-31 07:47:23 -07:00
Mohammad Samman
dd4317db43
build: fixed build warning
...
to clear warning and ensure git sha linkage works in the future
Fixes #3406
2015-08-30 15:05:56 -07:00
Xiang Li
b9632e0f8d
storage: register txnCounter
2015-08-28 15:17:16 -07:00
Xiang Li
dd443be41b
storage: report total number of keys
2015-08-28 15:16:53 -07:00
Yicheng Qin
d2cb732c7b
test: activate test on storage/backend
2015-08-28 13:52:31 -07:00
Yicheng Qin
054fab84ee
storage/backend: remove startc var
...
This makes start logic cleaner.
2015-08-28 13:52:31 -07:00
Xiang Li
fca98c9071
Merge pull request #3398 from xiang90/storage_metrics
...
storage: add initial metrics for kv
2015-08-28 13:50:44 -07:00
Xiang Li
b5838edb93
storage: add initial metrics for kv
2015-08-28 13:41:42 -07:00
Xiang Li
6cbaaa715c
Merge pull request #3396 from bdarnell/multinode-propose-panic
...
raft: Fix a nil-pointer panic in MultiNode.Propose.
2015-08-28 12:34:49 -07:00
Yicheng Qin
cba7c6a180
*: bump to v2.2.0-rc.0+git
2015-08-28 10:26:56 -07:00
Yicheng Qin
dc3e027288
*: bump to v2.2.0-rc.0
2015-08-28 10:26:32 -07:00
Yicheng Qin
b40e077047
Merge pull request #3388 from sckott/docfix-tuning
...
fix docs, change tuning link in api.md from section to file
2015-08-28 09:23:58 -07:00
Ben Darnell
05924b330a
raft: Fix a nil-pointer panic in MultiNode.Propose.
2015-08-28 11:17:59 +02:00
Yicheng Qin
f04884f74d
storage/backend: fix off-by-one error for pending var
...
Or it may commit until batchLimit + 1.
2015-08-27 22:51:32 -07:00
