Yicheng Qin
bb287fa22e
Merge pull request #3051 from yichengq/doc-rafthttp-metrics
...
docs: doc metrics used in rafthttp package
2015-06-29 10:22:50 -07:00
Xiang Li
c069119abe
Merge pull request #3067 from xiang90/storage_created_mod
...
storage: save created index and modified index
2015-06-27 23:11:05 -07:00
Yicheng Qin
fcdd9779e9
docs: explain label in rafthttp metrics
2015-06-26 15:51:39 -07:00
Xiang Li
4581064060
storage: save created index and modified index
2015-06-26 12:10:26 -07:00
Yicheng Qin
3e455ed104
Merge pull request #3062 from yichengq/fix-auth-doc
...
docs: fix typos in auth_api.md
2015-06-25 17:54:05 -07:00
Yicheng Qin
9c695dce25
docs: fix typos in auth_api.md
2015-06-25 17:37:16 -07:00
Barak Michener
acca9cc3a9
Merge pull request #3047 from barakmich/auth_cov
...
auth: improve test coverage
2015-06-25 14:47:22 -04:00
Barak Michener
39c10d1fe4
auth: improve test coverage
2015-06-25 14:25:08 -04:00
Yicheng Qin
3d4642c2c4
Merge pull request #3059 from yichengq/fix-wait-stress-test
...
pkg/wait: extend timeout to check closed channel
2015-06-25 11:16:54 -07:00
Xiang Li
35d0839909
Merge pull request #3057 from yichengq/fix-snap-test
...
etcdserver: fix TestTriggerSnap
2015-06-25 10:51:36 -07:00
Xiang Li
a347e1ecf5
Merge pull request #3058 from yichengq/fix-purge
...
pkg/fileutil: fix TestPurgeFile
2015-06-25 10:50:36 -07:00
Yicheng Qin
eea7f28be4
pkg/wait: extend timeout to check closed channel
...
It is possible to trigger the time.After case if the timer went off
between time.After setting the timer for its channel and the time that
select looked at the channel. So it needs to be longer.
refer: https://groups.google.com/forum/#!topic/golang-nuts/1tjcV80ccq8
2015-06-25 10:43:12 -07:00
Yicheng Qin
4c8408f92f
docs: doc metrics used in rafthttp package
2015-06-25 10:38:36 -07:00
Yicheng Qin
107263ef9f
pkg/fileutil: fix TestPurgeFile
...
It needs to wait longer for file to be detected and removed sometimes.
2015-06-25 10:09:20 -07:00
Yicheng Qin
5d131acfba
etcdserver: fix TestTriggerSnap
...
Before checking, it needs to wait for snapshot goroutine to finish its
work.
2015-06-25 09:58:36 -07:00
Xiang Li
2ace10626d
Merge pull request #3050 from yichengq/doc-bench-tool
...
docs/benchmarks: doc benchmark tool
2015-06-25 08:15:02 -07:00
Chance Zibolski
ca2ea1bc7d
Merge pull request #3048 from ecnahc515/documentation_improvements
...
Documentation: Refer back between name and initial-cluster options
2015-06-24 15:22:46 -07:00
Yicheng Qin
0949cc06e6
docs/benchmarks: doc benchmark tool
2015-06-24 15:11:08 -07:00
Chance Zibolski
ea2c203aee
Documentation: Refer back between name and initial-cluster options
2015-06-24 14:10:42 -07:00
Xiang Li
44fda7985a
Merge pull request #3046 from xiang90/metrics
...
refactor metrics
2015-06-24 13:58:28 -07:00
Xiang Li
9aeb181d75
snap: add namespace and subsystem fields for metrics
2015-06-24 13:46:43 -07:00
Xiang Li
c221844d6b
Merge pull request #3024 from xiang90/fix_discovery
...
discovery: add timeouts for discovery client
2015-06-24 13:44:21 -07:00
Xiang Li
52c2a5731f
etcdserver: fix typo in metrics.go
2015-06-24 12:42:40 -07:00
Xiang Li
b3cb5f9e4e
Merge pull request #3043 from xiang90/update_auth_doc
...
auth: update the auth doc
2015-06-23 23:19:02 -07:00
Xiang Li
96c0c7a202
Merge pull request #3044 from xiang90/fix_auth_update_role
...
auth: do not allow update root role
2015-06-23 22:43:28 -07:00
Xiang Li
030d1bbf2d
auth: do not allow update root role
2015-06-23 20:15:08 -07:00
Xiang Li
403fad14ae
auth: update the auth doc
2015-06-23 20:02:48 -07:00
Xiang Li
c0b5cc6c52
Merge pull request #3041 from xiang90/auth_u
...
etcdhttp: improve user endpoint validation
2015-06-23 15:58:03 -07:00
Xiang Li
94f8152487
Merge pull request #3042 from yichengq/fix-addr-in-use
...
integration: fix bind-addr-in-use
2015-06-23 15:57:50 -07:00
Yicheng Qin
88b69a5979
Merge pull request #3030 from yichengq/fix-fallback-case
...
etcdmain: fix the check in fallback-to-proxy case
2015-06-23 14:48:45 -07:00
Yicheng Qin
8e79fd85cb
integration: fix bind-addr-in-use
...
The bug happens when restarted member wants to listen on its original
port, but finds out that it has been occupied by some client.
Use well-known port instead of ephemeral port, so client cannot occupy
the listen port anymore.
2015-06-23 14:47:21 -07:00
Xiang Li
e291dfd748
etcdhttp: improve user endpoint validation
...
Giving both roles and grant/revoke is not allowed.
Creating an existing user is not allowed.
Updating a non-existing user is not allowed.
2015-06-23 14:38:44 -07:00
Yicheng Qin
2d426b518a
Merge pull request #3035 from yichengq/update-term
...
rafthttp: update term when AddPeer
2015-06-23 14:05:37 -07:00
Xiang Li
37933cffa4
Merge pull request #3040 from xiang90/fix_auth
...
Fix auth
2015-06-23 13:47:25 -07:00
Yicheng Qin
cf050ee21d
Merge pull request #2943 from yichengq/fix-client-test
...
client: fix TestSimpleHTTPClientDoCancelContextResponseBodyClosed
2015-06-23 13:43:07 -07:00
Yicheng Qin
e25e368321
rafthttp: update term when AddPeer
...
Update term when AddPeer, or the term in peer will not be updated until
the term is changed. This fixes the log flood happended when the v2.1
follower applies the snapshot from v2.0 leader:
```
rafthttp: cannot attach out of data stream server [0 / 17]
```
or
```
rafthttp: server streaming to 6e3bd23ae5f1eae0 at term 0 has been
stopped
```
2015-06-23 13:42:21 -07:00
Xiang Li
c8628c8fe5
auth: separate the role create and update path
...
Giving both permission and grant/revoke is not allowed.
Creating an existing role is not allowed.
Updating a non-existing is not allowed.
2015-06-23 13:15:32 -07:00
Yicheng Qin
36c5fd6265
etcdmain: fix the check in fallback-to-proxy case
...
advertise-client-urls has to be set if listen-client-urls is set when
fallbacking to proxy, which breaks the behavior. Loosen the check to fix
it.
2015-06-23 13:08:56 -07:00
Xiang Li
bc61056912
etcdhttp: use correct http status const when writing http error
2015-06-23 12:40:30 -07:00
Xiang Li
4f47a6ebfb
Merge pull request #3032 from xiang90/refactor_update_role
...
auth: refactor updateRole
2015-06-23 11:17:45 -07:00
Xiang Li
240e121792
Merge pull request #3039 from xiang90/update_auth
...
doc: update auth_api.md
2015-06-23 11:12:47 -07:00
Xiang Li
aaf802f321
doc: update auth_api.md
2015-06-23 11:08:04 -07:00
Xiang Li
ad7124599d
Merge pull request #3033 from barakmich/strip_pass
...
etcdhttp: Always strip password hash when returning users
2015-06-22 18:39:50 -07:00
Xiang Li
7f7e2cc79d
Merge pull request #3034 from philips/replace-maximal-with-maximum
...
*: docs and code %s%maximal%maximum%g
2015-06-22 16:24:01 -07:00
Brandon Philips
740187f199
*: docs and code %s%maximal%maximum%g
...
maximum is a more common word, use it instead
2015-06-22 16:06:57 -07:00
Yicheng Qin
028a1d6dd4
Merge pull request #2994 from webner/feature/cancel-proxy-request
...
proxy: handle canceled proxy request gracefully
2015-06-22 16:06:05 -07:00
Barak Michener
d5a0e3ac6a
etcdhttp: Always strip password hash when returning users
2015-06-22 18:39:16 -04:00
Xiang Li
979f531261
auth: refactor updateRole
...
We will return error if revoke or grant fails to update the role.
No need to check if revoke or grant is nil or not.
2015-06-22 15:16:10 -07:00
Xiang Li
462baedcd4
Merge pull request #3031 from xiang90/fix_auth
...
auth: do not allow to grant duplicate role or revoke ungranted role
2015-06-22 15:13:26 -07:00
Xiang Li
3f82e7b116
auth: do not allow to grant duplicate role or revoke ungranted role to a user
2015-06-22 15:11:09 -07:00
