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,931 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

15931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Wang
bf22b350b0
Merge pull request #15584 from mitake/follow-up-for-15542 
[3.4] etcdserver: keep server side change of 14548
 2023-03-30 06:34:08 +08:00
Hitoshi Mitake
01c0d8b309 etcdserver: keep server side change of 14548 
Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com>
 2023-03-28 21:43:17 +09:00
Marek Siarkowicz
2b189d8638
Merge pull request #15562 from serathius/fix-e2e 
tests: Avoid testing package root tests in e2e
 2023-03-28 13:53:49 +02:00
Marek Siarkowicz
3f6429d702 tests: Avoid testing package root tests in e2e 
Changes invocation from `go test -timeout 30m -v -cpu 1,2,4 '' -v
--count 1 go.etcd.io/etcd/tests/e2e` to `go test -timeout 30m -v -cpu 1,2,4 -v --count 1 go.etcd.io/etcd/tests/e2e` (removes '').
Those braces caused tests to also run in root package.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-28 11:07:34 +02:00
Marek Siarkowicz
63c7a038eb
Merge pull request #15555 from serathius/run-e2e 
Run e2e tests in CI
 2023-03-27 13:38:53 +02:00
Marek Siarkowicz
73f152e61e Run e2e tests in CI 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-27 12:12:36 +02:00
Marek Siarkowicz
e0fcb9e637
Merge pull request #15504 from fuweid/fix-15487 
[3.4] fix: enable strict mode for CI
 2023-03-23 12:41:08 +01:00
Benjamin Wang
82de82ee80
Merge pull request #15486 from jmhbnz/release-3.4 
[3.4] Backport tls 1.3 support
 2023-03-23 15:25:17 +08:00
Wei Fu
3fc5fbeaa0 fix: enable strict mode for CI 
fixes: #15487

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-22 17:55:58 +08:00
Benjamin Wang
284c312fd4
Merge pull request #15518 from fuweid/cp-15509-to-3.4 
[3.4] server/embed: fix data race when start insecure grpc
 2023-03-22 12:10:01 +08:00
Benjamin Wang
336ac78ebe
Merge pull request #15542 from mitake/revert-14548-v2 
[3.4] Revert 14548
 2023-03-22 06:19:30 +08:00
Hitoshi Mitake
be808bde23 Revert "tests: a test case for watch with auth token expiration" 
This reverts commit 91365174b33b15ff165997d6312abab7935a6ebe.

Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com>
 2023-03-21 22:13:27 +09:00
Hitoshi Mitake
c8f890cde1 Revert "*: handle auth invalid token and old revision errors in watch" 
This reverts commit 0c6e466024ea2030380b13e3e2248b0b8fb879ca.

Signed-off-by: Hitoshi Mitake <h.mitake@gmail.com>
 2023-03-21 22:13:17 +09:00
Benjamin Wang
46ae7ebd96
Merge pull request #15520 from serathius/fix-issue15271-3.4 
[v3.4] Fix issue15271
 2023-03-21 06:39:25 +08:00
Marek Siarkowicz
29ecfc0185 server: Test watch restore 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-20 16:06:10 +01:00
Bogdan Kanivets
8160d9aea5 mvcc: update minRev when watcher stays synced 
Problem: during restore in watchableStore.Restore, synced watchers are moved to unsynced.
minRev will be behind since it's not updated when watcher stays synced.

Solution: update minRev

fixes: https://github.com/etcd-io/etcd/issues/15271
Signed-off-by: Bogdan Kanivets <bkanivets@apple.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-20 16:04:49 +01:00
Wei Fu
303519c7b8 server/embed: fix data race when start insecure grpc 
There are two goroutines accessing the `gs` grpc server var. Before
insecure `gs` server start, the `gs` can be changed to secure server and
then the client will fail to connect to etcd with insecure request. It
is data-race. We should use argument for reference in the new goroutine.

fix: #15495

Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit a9988e2625eede1af81d189b5f2ecf7d4af3edf1)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-03-20 21:33:16 +08:00
James Blair
d8f7cfe28d
Backport tls 1.3 support. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-03-16 21:46:17 +13:00
Marek Siarkowicz
2eabc0bc70
Merge pull request #15482 from ahrtr/3.4_gomod_cleanup_20230315 
[3.4] cleanup the go.mod & go.sum files
 2023-03-15 09:17:41 +01:00
Benjamin Wang
7c6b0882fd cleanup the go.mod & go.sum files 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-03-15 07:11:33 +08:00
Marek Siarkowicz
08a42e65a8
Merge pull request #15478 from serathius/watch-random-scheduler-3.4 
Watch random scheduler 3.4
 2023-03-14 11:32:20 +01:00
Marek Siarkowicz
60e381aaa9 server: Switch back to random scheduler to improve resilience to watch starvation 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-14 10:33:15 +01:00
Marek Siarkowicz
e818b5fac8 test: Test etcd watch stream starvation under high read response load when sharing the same connection 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-14 10:33:06 +01:00
Marek Siarkowicz
6025355ce0 tests: Allow configuring progress notify interval in e2e tests 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-03-14 10:26:43 +01:00
Benjamin Wang
4cdb91db15
Merge pull request #15429 from jmhbnz/release-3.4-backport 
[3.4] Backport update to latest go 1.19.7 release
 2023-03-08 19:07:44 +08:00
James Blair
51ea1c0abe
Updated go to 1.19.7. 
Mitigates CVE-2023-24532.

Signed-off-by: James Blair <mail@jamesblair.net>
 2023-03-08 22:46:34 +13:00
Piotr Tabor
20eee55557
Merge pull request #15333 from jmhbnz/release-3.4 
[3.4] Backport bump to go 1.19.6 and golang.org/x/net to v0.7.0
 2023-03-03 11:11:04 +01:00
James Blair
a91bacf567
Formatted source code for go 1.19.6. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-20 12:44:14 +13:00
James Blair
7318f5dd0c
Bump golang.org/x/net to v0.7.0 to address CVE GO-2023-1571. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-20 11:41:25 +13:00
James Blair
9570978e93
Bump to go 1.19.6 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-20 11:41:01 +13:00
Benjamin Wang
6d1bfe4f99 bump version to 3.4.24 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
v3.4.24 		2023-02-16 09:39:00 +08:00
Benjamin Wang
9c81b86e90 test: enhance the test case TestV3WatchProgressOnMemberRestart 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-10 21:03:53 +08:00
Benjamin Wang
ed529ab0e5 clientv3: correct the nextRev on receving progress notification response 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-10 16:47:56 +08:00
James Blair
d32dceb8a6 Fix regression in timestamp resolution 
Historic capnslog timestamps are in microsecond resolution. We need to match that when we migrate to the zap logger.

Signed-off-by: James Blair <mail@jamesblair.net>
 2023-02-10 04:35:24 +08:00
Marek Siarkowicz
fb7a8973bd
Merge pull request #15265 from ahrtr/3.4_walSync_failpoint_20230209 
[3.4] etctserver: add failpoints walBeforeSync and walAfterSync
 2023-02-09 09:10:19 +01:00
Benjamin Wang
109873dcb6 etctserver: add failpoints walBeforeSync and walAfterSync 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-09 07:06:46 +08:00
Benjamin Wang
b4e3ed72e3 bump bbolt to v1.3.7 for release-3.4 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-02-02 03:47:21 +08:00
Wilson Wang
2f8158650f server: set multiple concurrentReadTx instances share one txReadBuffer. 
(cherry picked from commit 9c82e8c72b96eec1e7667a0e139a07b944c33b75)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-30 11:43:19 +08:00
kidsan
c5347cb0c6 netutil: consistently format ipv6 addresses 
This formats ipv6 addresses to ensure they can be compared safely

Signed-off-by: kidsan <8798449+Kidsan@users.noreply.github.com>
 2023-01-27 06:49:26 +08:00
Iavael
d2fc8dbeeb docker: remove nsswitch.conf 
Signed-off-by: Iavael <905853+iavael@users.noreply.github.com>
 2023-01-25 02:45:52 +08:00
Benjamin Wang
e4b154231c
Merge pull request #15137 from fuweid/backport-11990-to-3.4 
[3.4] mvcc: push down RangeOptions.limit argv into index tree to reduce memory overhead
 2023-01-20 06:23:32 +08:00
Wei Fu
931cf9a814 mvcc: update ut for Revisions/CountRevisions 
It is kind of backport from etcd-io#14124.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-18 10:18:57 +08:00
Marek Siarkowicz
1246c52d04 etcdserver: Fix invalid count returned on Range with Limit 
(cherry picked from commit 182aef6e6b28d2f62cd7281f38c12899d8006a15)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-18 10:02:10 +08:00
tangcong
d48f7ad7c1 mvcc: push down RangeOptions.limit argv into index tree 
(cherry picked from commit 26c930f27d46776da5fedae69267ba0b69c31185)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-18 10:01:20 +08:00
Benjamin Wang
a1d1af5774
Merge pull request #15099 from fuweid/backport-11771-11743-pr-to-3.4 
[3.4] mvcc: reduce count-only range overhead
 2023-01-18 08:48:29 +08:00
Piotr Tabor
4be8c0e5a5
Merge pull request #15097 from ahrtr/3.4_promote_non_exist_id_20230113 
[3.4] etcdserver: return membership.ErrIDNotFound when the memberID not found
 2023-01-17 09:15:02 +01:00
Benjamin Wang
00b31512a1 etcdserver: return membership.ErrIDNotFound when the memberID not found 
Backport https://github.com/etcd-io/etcd/pull/15095 to 3.4.

When promoting a learner, we need to wait until the leader's applied ID
catches up to the commitId. Afterwards, check whether the learner ID
exist or not, and return `membership.ErrIDNotFound` directly in the API
if the member ID not found, to avoid the request being unnecessarily
delivered to raft.

Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-01-17 06:27:31 +08:00
Wei Fu
10c080dc5e mvcc: Add ut for Revisions/CountRevisions 
It is kind of backport from #14124.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-16 15:15:34 +08:00
tangcong
2070f55aab e2e: add getCountOnlyTest testcase 
(cherry picked from commit 3594ab94cfefa7488993ac14e7b410ee63b25d3d)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-13 16:33:56 +08:00
tangcong
00a005c300 mvcc: reduce count-only range overhead 
(cherry picked from commit 730f3f1d783fc1159a4c2e258713e5b1fe3ec5b4)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-01-13 16:32:35 +08:00