Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,581 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

15581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gary Belvin
e048e166ab
cherry pick of #11564 (#11880) 
* clientv3: fix grpc-go(v1.27.0) incompatible changes to balancer/resolver.

* vendor: upgrade gRPC Go to v1.24.0

Picking up some performance improvements and bug fixes.

https://github.com/grpc/grpc-go/releases/tag/v1.24.0

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>

* vendor: update gRPC Go to v1.26.0 (#11522)

* GO111MODULE=on go mod vendor

* GO111MODULE=on go mod vendor go 1.14

Bump travis 2

Co-authored-by: EDDYCJY <313687982@qq.com>
Co-authored-by: Gyuho Lee <leegyuho@amazon.com>
Co-authored-by: Yuchen Zhou <yczhou@google.com>
 2020-05-13 10:12:58 -07:00
Gyuho Lee
2333c727a2
Merge pull request #11855 from tangcong/automated-cherry-pick-of-#11817-origin-release-3.4 
Automated cherry pick of #11817 on release-3.4
 2020-05-07 20:00:26 -07:00
tangcong
aa75e90ac8 mvcc: fix deadlock bug 2020-05-08 09:56:23 +08:00
Jingyi Hu
f1eca4e1fa
Merge pull request #11752 from tangcong/automated-cherry-pick-of-#11652-#11670-#11710-origin-release-3.4 
Automated cherry pick of #11652 #11670 #11710
 2020-04-10 23:21:45 +08:00
tangcong
b733b22712 auth: ensure RoleGrantPermission is compatible with older versions 2020-04-09 09:33:40 +08:00
tangcong
eb80716532 etcdserver: print warn log when failed to apply request 2020-04-09 09:33:40 +08:00
tangcong
e2abd97659 auth: cleanup saveConsistentIndex in NewAuthStore 2020-04-09 09:33:40 +08:00
tangcong
716821b9b5 auth: print warning log when error is ErrAuthOldRevision 2020-04-09 09:33:40 +08:00
shawwang
63116ffdb4 auth: add new metric 'etcd_debugging_auth_revision' 2020-04-09 09:33:40 +08:00
shawwang
b3d54def77 tools/etcd-dump-db: add auth decoder, optimize print format 2020-04-09 09:33:40 +08:00
tangcong
347c8dac3b *: fix auth revision corruption bug 2020-04-09 09:33:36 +08:00
Sahdev Zala
e2ae6013a4
Merge pull request #11757 from jingyih/automated-cherry-pick-of-#11754-upstream-release-3.4 
Automated cherry pick of #11754 on release-3.4
 2020-04-06 11:09:26 -04:00
Changxin Miao
9c8554573f etcdserver: watch stream got closed once one request is not permitted (#11708) 2020-04-06 07:06:57 -07:00
Gyuho Lee
e694b7bb08 version: 3.4.7 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
v3.4.7 		2020-04-01 10:46:54 -07:00
Gyuho Lee
e99399d0dc wal: add "etcd_wal_writes_bytes_total" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-04-01 09:30:09 -07:00
Gyuho Lee
b68f8ff31d pkg/ioutil: add "FlushN" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-04-01 09:29:59 -07:00
Gyuho Lee
857dffa386
Merge pull request #11734 from jingyih/automated-cherry-pick-of-#11330-upstream-release-3.4 
Cherry pick of #11330 on release-3.4
 2020-03-31 14:58:59 -07:00
jingyih
5f17aa2c8b test: auto detect branch when finding merge base 2020-03-31 10:59:44 -07:00
shenjiangc
89b10cf967 mvcc/kvstore:when the number key-value is greater than one million, compact take too long and blocks other requests 2020-03-30 08:21:38 -07:00
Gyuho Lee
bdc9bc1d81 version: 3.4.6 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
v3.4.6 		2020-03-29 12:47:27 -07:00
tangcong
b0bdaaa449 lease: fix memory leak in LeaseGrant when node is follower 2020-03-29 12:47:14 -07:00
Gyuho Lee
e784ba73c2 version: 3.4.5 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
v3.4.5 		2020-03-18 17:24:42 -07:00
Gyuho Lee
35dc623a98 words: whitelist "racey" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-03-18 17:24:15 -07:00
Gyuho Lee
130342152a Revert "version: 3.4.5" 
This reverts commit 0dc5d577fc08b3666481fdf9617035280c6f5e3f.
 2020-03-18 17:17:19 -07:00
Gyuho Lee
fc93fbf9de words: whitelist "hasleader" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-03-18 17:17:04 -07:00
Gyuho Lee
0dc5d577fc version: 3.4.5 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-03-18 17:17:04 -07:00
Gyuho Lee
e63db56cc9 etcdserver/api/v3rpc: handle api version metadata, add metrics 
ref.
https://github.com/etcd-io/etcd/pull/11687

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-03-18 17:17:04 -07:00
Gyuho Lee
1471e12108 clientv3: embed api version in metadata 
ref.
https://github.com/etcd-io/etcd/pull/11687

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>

clientv3: fix racy writes to context key

=== RUN   TestWatchOverlapContextCancel

==================

WARNING: DATA RACE

Write at 0x00c42110dd40 by goroutine 99:

  runtime.mapassign()

      /usr/local/go/src/runtime/hashmap.go:485 +0x0

  github.com/coreos/etcd/clientv3.metadataSet()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/ctx.go:61 +0x8c

  github.com/coreos/etcd/clientv3.withVersion()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/ctx.go:47 +0x137

  github.com/coreos/etcd/clientv3.newStreamClientInterceptor.func1()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/client.go:309 +0x81

  google.golang.org/grpc.NewClientStream()

      /go/src/github.com/coreos/etcd/gopath/src/google.golang.org/grpc/stream.go:101 +0x10e

  github.com/coreos/etcd/etcdserver/etcdserverpb.(*watchClient).Watch()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/etcdserver/etcdserverpb/rpc.pb.go:3193 +0xe9

  github.com/coreos/etcd/clientv3.(*watchGrpcStream).openWatchClient()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/watch.go:788 +0x143

  github.com/coreos/etcd/clientv3.(*watchGrpcStream).newWatchClient()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/watch.go:700 +0x5c3

  github.com/coreos/etcd/clientv3.(*watchGrpcStream).run()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/watch.go:431 +0x12b

Previous read at 0x00c42110dd40 by goroutine 130:

  reflect.maplen()

      /usr/local/go/src/runtime/hashmap.go:1165 +0x0

  reflect.Value.MapKeys()

      /usr/local/go/src/reflect/value.go:1090 +0x43b

  fmt.(*pp).printValue()

      /usr/local/go/src/fmt/print.go:741 +0x1885

  fmt.(*pp).printArg()

      /usr/local/go/src/fmt/print.go:682 +0x1b1

  fmt.(*pp).doPrintf()

      /usr/local/go/src/fmt/print.go:998 +0x1cad

  fmt.Sprintf()

      /usr/local/go/src/fmt/print.go:196 +0x77

  github.com/coreos/etcd/clientv3.streamKeyFromCtx()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/watch.go:825 +0xc8

  github.com/coreos/etcd/clientv3.(*watcher).Watch()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/watch.go:265 +0x426

  github.com/coreos/etcd/clientv3/integration.testWatchOverlapContextCancel.func1()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/integration/watch_test.go:959 +0x23e

Goroutine 99 (running) created at:

  github.com/coreos/etcd/clientv3.(*watcher).newWatcherGrpcStream()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/watch.go:236 +0x59d

  github.com/coreos/etcd/clientv3.(*watcher).Watch()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/watch.go:278 +0xbb6

  github.com/coreos/etcd/clientv3/integration.testWatchOverlapContextCancel.func1()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/integration/watch_test.go:959 +0x23e

Goroutine 130 (running) created at:

  github.com/coreos/etcd/clientv3/integration.testWatchOverlapContextCancel()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/integration/watch_test.go:979 +0x76d

  github.com/coreos/etcd/clientv3/integration.TestWatchOverlapContextCancel()

      /go/src/github.com/coreos/etcd/gopath/src/github.com/coreos/etcd/clientv3/integration/watch_test.go:922 +0x44

  testing.tRunner()

      /usr/local/go/src/testing/testing.go:657 +0x107

==================

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-03-18 17:17:00 -07:00
Gyuho Lee
0b9cfa8677 etcdserver/api/etcdhttp: log server-side /health checks 
ref.
https://github.com/etcd-io/etcd/pull/11704

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2020-03-18 16:29:24 -07:00
Sam Batschelet
b66c53ff5f proxy/grpcproxy: add return on error for metrics handler 
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
 2020-03-16 12:06:01 -04:00
Sahdev Zala
8f6c3f4d09
Merge pull request #11664 from jingyih/automated-cherry-pick-of-#11638-upstream-release-3.4 
Automated cherry pick of #11638 on release-3.4
 2020-03-11 19:26:11 -04:00
jingyih
379d01a0d2 etcdctl: fix member add command 
Use members information from member add response, which is
guaranteed to be up to date.
 2020-02-29 07:18:11 -08:00
Gyuho Lee
c65a9e2dd1 version: 3.4.4 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
v3.4.4 		2020-02-24 13:14:02 -08:00
Jingyi Hu
7862f6ed2c
Merge pull request #11644 from jingyih/automated-cherry-pick-of-#11640-upstream-release-3.4 
Automated cherry pick of #11640 on release-3.4
 2020-02-23 14:42:34 +08:00
Rafael Fernández López
257319fb18 etcdserver: fix quorum calculation when promoting a learner member 
When promoting a learner member we should not count already a voting
member, but take only into account the number of existing voting
members and their current status (started, unstarted) when taking the
decision whether a learner member can be promoted.

Before this change, it was impossible to grow from a quorum N to a N+1
through promoting a learning member.

Fixes: #11633
 2020-02-21 23:14:55 -08:00
Jingyi Hu
cdb2dc11b8
Merge pull request #11636 from YoyinZyc/automated-cherry-pick-of-#11621-upstream-release-3.4 
Automated cherry pick of #11621 to release-3.4
 2020-02-20 13:04:33 +08:00
jingyih
770674e4a6 etcdserver: corruption check via http 
During corruption check, get peer's hashKV via http call.
 2020-02-18 14:12:19 -08:00
Jingyi Hu
c10168f718
Merge pull request #11631 from jingyih/automated-cherry-pick-of-#11630-upstream-release-3.4 
Automated cherry pick of #11630 to release-3.4
 2020-02-16 08:35:23 +08:00
jingyih
94673a6ba4 mvcc/backend: check for nil boltOpenOptions 
Check if boltOpenOptions is nil before use it.
 2020-02-15 00:18:26 -08:00
Joe Betz
a1bf5574fc
Merge pull request #11622 from jpbetz/automated-cherry-pick-of-#11613-origin-release-3.4 
Automated cherry pick of #11613 to release-3.4
 2020-02-13 14:45:38 -08:00
Joe Betz
6d646c442a
mvcc/backend: Delete orphaned db.tmp files before defrag 2020-02-13 12:26:54 -08:00
Jingyi Hu
1226686cf3
Merge pull request #11588 from jingyih/automated-cherry-pick-of-#11586-upstream-release-3.4 
Automated cherry pick of #11586 on release 3.4
 2020-02-04 19:45:59 -08:00
jingyih
50e12328ac auth: correct logging level 2020-02-04 05:38:58 -08:00
Jingyi Hu
0dc78a144b
Merge pull request #11439 from YoyinZyc/automated-cherry-pick-of-#11418-upstream-release-3.4 
Automated cherry pick of #11418 to release 3.4
 2019-12-11 14:41:06 -08:00
yoyinzyc
7cf32c262c e2e: test curl auth on onoption user 2019-12-10 12:53:10 -08:00
yoyinzyc
4a9247a47e auth: fix NoPassWord check when add user 2019-12-10 12:53:10 -08:00
Jingyi Hu
ac63c2fbd0
Merge pull request #11415 from YoyinZyc/automated-cherry-pick-of-#11413-upstream-release-3.4 
Automated cherry pick of #11413 to release-3.4
 2019-12-02 14:51:47 -08:00
yoyinzyc
ae5bd3c268 auth: fix user.Options nil pointer 2019-12-02 14:44:15 -08:00
Jingyi Hu
94e46ba0d7
Merge pull request #11403 from jingyih/automated-cherry-pick-of-#11400-upstream-release-3.4 
Automated cherry pick of #11400 on release 3.4
 2019-11-27 13:28:34 -08:00
宇慕
8c10973820 mvcc/kvstore:fixcompactbug 2019-11-27 13:07:47 -08:00