c221844d6b
Merge pull request #3024 from xiang90/fix_discovery
...
discovery: add timeouts for discovery client
2015-06-24 13:44:21 -07:00
52c2a5731f
etcdserver: fix typo in metrics.go
2015-06-24 12:42:40 -07:00
b3cb5f9e4e
Merge pull request #3043 from xiang90/update_auth_doc
...
auth: update the auth doc
2015-06-23 23:19:02 -07:00
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
030d1bbf2d
auth: do not allow update root role
2015-06-23 20:15:08 -07:00
403fad14ae
auth: update the auth doc
2015-06-23 20:02:48 -07:00
c0b5cc6c52
Merge pull request #3041 from xiang90/auth_u
...
etcdhttp: improve user endpoint validation
2015-06-23 15:58:03 -07:00
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
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
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
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
2d426b518a
Merge pull request #3035 from yichengq/update-term
...
rafthttp: update term when AddPeer
2015-06-23 14:05:37 -07:00
37933cffa4
Merge pull request #3040 from xiang90/fix_auth
...
Fix auth
2015-06-23 13:47:25 -07:00
cf050ee21d
Merge pull request #2943 from yichengq/fix-client-test
...
client: fix TestSimpleHTTPClientDoCancelContextResponseBodyClosed
2015-06-23 13:43:07 -07:00
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
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
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
bc61056912
etcdhttp: use correct http status const when writing http error
2015-06-23 12:40:30 -07:00
4f47a6ebfb
Merge pull request #3032 from xiang90/refactor_update_role
...
auth: refactor updateRole
2015-06-23 11:17:45 -07:00
240e121792
Merge pull request #3039 from xiang90/update_auth
...
doc: update auth_api.md
2015-06-23 11:12:47 -07:00
aaf802f321
doc: update auth_api.md
2015-06-23 11:08:04 -07:00
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
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
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
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
d5a0e3ac6a
etcdhttp: Always strip password hash when returning users
2015-06-22 18:39:16 -04:00
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
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
3f82e7b116
auth: do not allow to grant duplicate role or revoke ungranted role to a user
2015-06-22 15:11:09 -07:00
51a65599dd
Merge pull request #3021 from xiang90/auth_err
...
etcdserver: use correct http status code for auth error
2015-06-22 14:58:33 -04:00
c39aad0e92
etcdserver: use correct http status code for auth error
2015-06-22 09:28:47 -07:00
3e4479b0cd
Merge pull request #3022 from xiang90/aut_type
...
etcdhttp: fix the response type for auth
2015-06-21 15:06:35 -07:00
ebd4102578
Merge pull request #3026 from xiang90/better_logging
...
etcdserver: better log message for url mismatch
2015-06-19 19:39:33 -07:00
d295d21349
etcdserver: better log message for url mismatch
2015-06-19 19:36:26 -07:00
1381b44adf
discovery: add timeouts for discovery client
2015-06-19 16:50:44 -07:00
cad757efa0
etcdhttp: fix the response type for auth
2015-06-19 15:19:00 -07:00
b26b827780
Merge pull request #3020 from xiang90/auth_doc
...
auth: minor fix for user section
2015-06-19 15:08:51 -07:00
b1dbab2b6b
auth: minor fix for user section
2015-06-19 14:30:04 -07:00
9f984ea6ae
Merge pull request #3015 from xiang90/auth_doc
...
doc: move enable section to the top in auth_api.md
2015-06-19 14:13:19 -07:00
4f0f57b322
doc: move enable section to the top in auth_api.md
2015-06-19 14:08:29 -07:00
7ee4fb6181
Merge pull request #3011 from philips/fixup-discovery-info-output
...
discovery: fixup logline
2015-06-19 13:25:08 -04:00
e71dc2e565
discovery: fixup logline
...
before:
```
discovery: duringcluster status checkconnection tohttps://discovery.etcd.iotimed out, retrying in2s
```
after:
```
discovery: cluster status check: connection to https://discovery.etcd.io timed out, retrying in 2s
```
2015-06-19 13:19:09 -04:00
a6e6186477
proxy: always set requestClosed flag when client closes the connection prematurely
2015-06-19 08:45:45 +02:00
5787fabe5f
Merge pull request #3008 from yichengq/storage-index-test
...
storage: add range and tombstone test for index
2015-06-18 19:29:31 -07:00
b20598eea0
storage: add range and tombstone test for index
2015-06-18 18:05:37 -07:00
1a7a5fd45d
Merge pull request #3006 from yichengq/storage-kvstore-test
...
storage: remove unnecessary ForceCommit in kvstore.Close
2015-06-18 13:57:27 -07:00
9f2e4c8a57
storage: remove unnecessary ForceCommit in kvstore.Close
...
s.b.Close will commit pending ops, so there is no need to FroceCommit
it in kvstore.Close()
2015-06-18 13:36:23 -07:00
789e2f3426
Merge pull request #3003 from yichengq/storage-kvstore-test
...
storage: add restore test and fix some bug
2015-06-18 12:19:05 -07:00
7cba42fb73
storage: wait for compact goroutine to exit before close backend
...
If backend is closed, the operations on backend in compact
goroutine will panic. So this PR waits for compact goroutine to exit
before close backend.
This fixes the TestWorkflow failure too.
2015-06-18 12:18:39 -07:00
5e31854afd
proxy: use atomic operations for requestCanceled flag
2015-06-18 20:56:28 +02:00
