Alex Robinson
57a5520157
snap: Record the snapshot save duration on success rather than only on error.
...
It makes more sense to record the latency of successes (or all attempts)
than of only a particular failure case.
2015-07-16 10:46:47 -07:00
Yicheng Qin
ebbb0caff0
Merge pull request #3136 from yichengq/fix-proxy-doc
...
docs: fix wrong proxy command
2015-07-15 11:30:07 -07:00
Yicheng Qin
d0e976ad4b
docs: fix wrong proxy command
2015-07-15 08:37:10 -07:00
Xiang Li
d0e3e2c992
Merge pull request #3131 from yichengq/remove-header-timeout
...
discovery: remove ResponseHeaderTimeout when discovery
2015-07-15 07:50:36 +08:00
Yicheng Qin
1db176151b
discovery: remove ResponseHeaderTimeout when discovery
...
The discovery service doesn't return HTTP header early when watch
starts. This may trigger ResponseHeaderTimeout and cause the watch
request failed.
The fix on discovery service may take some time. Remove the
ResponseHeaderTimeout first so it behaves as before.
2015-07-14 16:33:28 -07:00
Xiang Li
953a59d554
Merge pull request #3127 from yanana/emend-error-message
...
etcdmain: emend configuration error message
2015-07-14 13:46:08 +08:00
Shun Yanaura
d7276d6ace
etcdmain: emend configuration error message
...
etcd shows an odd message on configuration error like this (partially):
```
... discovery or bootstrap flags are setChoose one of ...
^^^^^^^^^
```
This commit fixes the message format problem.
2015-07-14 14:42:49 +09:00
Yicheng Qin
d80f4c8aa2
Merge pull request #3125 from yichengq/doc-tuning
...
docs: update tuning.md to match today's situation
2015-07-13 16:52:11 -07:00
Yicheng Qin
8b7c600009
docs: update tuning.md to match today's situation
...
1. etcd requires that election-timeout >= 5 * heartbeat-interval
2. etcd doesn't have flag -snapshot
2015-07-13 16:35:30 -07:00
Yicheng Qin
7a520bb80b
Merge pull request #3121 from yichengq/extend-schedule
...
pkg/testutil: extend wait schedule time to 10ms
2015-07-13 15:23:36 -07:00
Yicheng Qin
1624235bb3
pkg/testutil: extend wait schedule time to 10ms
...
Waiting 3ms is not long enough for schedule to work well. The test suite
may fail once per 200 times in travis due to this. Extend this to 10ms
to ensure schedule could work. Now it could run 1000 times successfully
in travis.
2015-07-13 09:05:40 -07:00
Yicheng Qin
5be545b872
Merge pull request #3077 from yichengq/fix-test-sync
...
etcdserver: init raft internal var early
2015-07-10 14:44:52 -07:00
Xiang Li
c7a949349e
Merge pull request #3113 from xiang90/fix_proxy_bt
...
etcdmain: proxy ignores discovery if it is initialized
2015-07-10 14:12:45 -06:00
Xiang Li
dedabddcb3
etcdmain: proxy ignores discovery if it is initialized
2015-07-10 12:52:24 -07:00
Xiang Li
61e9b99edb
Merge pull request #2417 from kelseyhightower/improve-etcdctl-ls-command-help
...
etcdctl: update the ls subcommand help to match behavior
2015-07-09 11:33:19 -06:00
Xiang Li
4631b727c0
Merge pull request #3105 from xiang90/rd
...
doc: add rolling upgrade doc for 2.1
2015-07-09 11:27:05 -06:00
Xiang Li
11452585bb
doc: add rolling upgrade doc for 2.1
2015-07-07 13:20:41 -07:00
Xiang Li
8ab388fa56
Merge pull request #3001 from mwitkow-io/feature/rich_metrics
...
Etcd Rich Metrics
2015-07-07 08:12:06 -07:00
Michal Witkowski
7bca757d09
*: add metrics to store and proxy.
2015-07-07 16:01:51 +01:00
Yicheng Qin
573f62f7a5
Merge pull request #3101 from yichengq/check-err
...
integration: always check error for function calls
2015-07-06 18:10:31 -07:00
Yicheng Qin
e7ed7a7b7a
integration: always check error for function calls
2015-07-06 17:44:36 -07:00
Brandon Philips
121ff4684c
Merge pull request #3097 from philips/tls-churn-faq
...
Documentation/security: add FAQ about peer TLS and etcd 2.0.x
2015-07-04 15:30:42 -07:00
Brandon Philips
83fe8187f4
Documentation/security: add FAQ about peer TLS and etcd 2.0.x
...
etcd 2.0.x TLS can appear not to work on smaller machines with less
horse-power or lots of other work going on. Document the timeout
workaround.
2015-07-04 15:28:47 -07:00
Xiang Li
cbe00e4415
Merge pull request #2967 from webner/feature/proxy-config
...
proxy: added endpoint refresh and timeout configuration values
2015-07-03 11:51:15 -07:00
Wolfgang Ebner
954e416bf6
proxy: fixed director.go formatting
2015-07-03 14:11:40 +02:00
Xiang Li
883bb47dcf
Merge pull request #3074 from xiang90/storage_restore
...
storage: correctly restore create and ver
2015-06-30 09:20:19 -07:00
Xiang Li
eff67afc60
Merge pull request #3081 from xiang90/storage_fix
...
storage: fix small issues
2015-06-29 22:05:46 -07:00
Xiang Li
585e74a1b1
Merge pull request #3080 from xiang90/rpc
...
add gRPC etcd service
2015-06-29 22:04:47 -07:00
Xiang Li
f8b947a00b
storage: fix small issues
2015-06-29 22:02:21 -07:00
Xiang Li
2fb8347d36
etcdserver: add rpc proto
2015-06-29 20:00:09 -07:00
Xiang Li
436bacd77a
*: introduce grpc dependency
2015-06-29 18:59:00 -07:00
Xiang Li
718cb18ca2
Merge pull request #3079 from xiang90/gogo
...
*: resolve proto warnings
2015-06-29 18:50:49 -07:00
Xiang Li
581ef05bab
*: resolve proto warnings
2015-06-29 18:39:46 -07:00
Xiang Li
621b43bacb
Merge pull request #3078 from xiang90/gogo
...
update gogoprotobuf dependency
2015-06-29 16:59:08 -07:00
Xiang Li
13f44e4b79
*: update generated proto code
2015-06-29 16:45:25 -07:00
Xiang Li
59b479e59b
godep: update gogo version
2015-06-29 16:08:04 -07:00
Yicheng Qin
7f95780bfb
etcdserver: init raft internal var early
...
Its `stopped`/`done` should be created always before being used
in defer in server loop.
It fixes the race detected when running TestSyncTrigger.
2015-06-29 15:34:15 -07:00
Yicheng Qin
235aef5365
*: bump to v2.1.0-rc.0+git
2015-06-29 14:02:40 -07:00
Yicheng Qin
00c32ef022
*: bump to v2.1.0-rc.0
2015-06-29 14:02:39 -07:00
Yicheng Qin
9884c9d977
Merge pull request #3075 from yichengq/fix-windows
...
Godeps/capnslog: bump to 99f6e6b8f8ea30b0f82769c1411691c44a66d015
2015-06-29 14:02:16 -07:00
Yicheng Qin
207b67c72a
Godeps/capnslog: bump to 99f6e6b8f8ea30b0f82769c1411691c44a66d015
...
It fixes windows building problem.
2015-06-29 13:47:21 -07:00
Xiang Li
433f2ee1bc
storage: correctly restore create and ver
...
Add a restore func to correctly restore create reversion and
version of keys for the index.
2015-06-29 13:44:43 -07:00
Xiang Li
8d3e3ff25a
Merge pull request #3073 from xiang90/storage_ver
...
storage: save version
2015-06-29 13:19:02 -07:00
Xiang Li
ccca2b04da
storage: save version
2015-06-29 13:15:09 -07:00
Yicheng Qin
bd84e678e6
Merge pull request #3061 from yichengq/fix-stream-test
...
rafthttp: fix TestStream uses outdated stream
2015-06-29 11:15:29 -07:00
Yicheng Qin
f421eaeff7
Merge pull request #3071 from yichengq/rename-rafthttp-metrics
...
rafthttp: message_sent_latency metrics: channel -> sendingType
2015-06-29 10:58:36 -07:00
Xiang Li
e01d53b853
Merge pull request #2979 from xiang90/fix_sendapp
...
raft: fix panic in send app
2015-06-29 10:49:04 -07:00
Yicheng Qin
28342ae097
rafthttp: avoid TestStream to use outdated stream
...
The original test code before fb4b0b5cf075212f79fcdfa58533915a29c0912d
doesn't work because reader side may update the
stream, while writer side writes message to the old stream and fails.
This PR removes unnecessary call to set term, and avoids this problem to
happen on term > 1 in the future.
2015-06-29 10:46:54 -07:00
Yicheng Qin
2afa6688ab
Merge pull request #3069 from yichengq/init-term
...
rafthttp: support to init term when adding peer
2015-06-29 10:45:53 -07:00
Yicheng Qin
606876154d
rafthttp: message_sent_latency metrics: channel -> sendingType
...
Better naming.
2015-06-29 10:44:40 -07:00
