engow
f7ac9dfcd6
sever/auth: fix addUserWithNoOption of store_test
...
Signed-off-by: engow <engow@hotmail.com>
2023-03-30 19:13:33 +08:00
tangcong
dcb1bf6078
server/auth: fix auth panic bug when user changes password
...
Signed-off-by: tangcong <tangcong506@foxmail.com>
Signed-off-by: engow <engow@hotmail.com>
2023-03-30 19:13:33 +08:00
Benjamin Wang
44d78bf9aa
Automated cherry-pick of #14860 : Trigger release in current branch for github workflow case
...
Signed-off-by: ArkaSaha30 <arkasaha30@gmail.com>
2023-03-30 16:39:08 +05:30
Benjamin Wang
fe37277c7e
Merge pull request #15517 from fuweid/cp-15509-to-3.5
...
[3.5] server/embed: fix data race when start insecure grpc
2023-03-20 21:45:59 +08:00
Wei Fu
9e974792f9
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 20:41:49 +08:00
Marek Siarkowicz
15b3756abd
Merge pull request #15515 from serathius/fix-issue15271-3.5
...
[v3.5] Fix issue15271
2023-03-20 13:08:31 +01:00
Marek Siarkowicz
92e56ab61e
server: Test watch restore
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-20 12:04:43 +01:00
Bogdan Kanivets
dafdaaedf2
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 12:02:49 +01:00
Marek Siarkowicz
930a450a55
Merge pull request #15491 from serathius/test-cmux-3.5
...
Connection multiplexing regression tests for v3.5
2023-03-18 13:23:36 +01:00
Marek Siarkowicz
86101d333b
tests: Add v2 API to connection multiplexing test
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-17 10:51:36 +01:00
Marek Siarkowicz
eb614c35f7
tests: Add connection muiltiplexer testing
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-17 10:51:35 +01:00
Marek Siarkowicz
2eeb26083f
tests: Backport RunUtilCompletion
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-17 10:50:21 +01:00
Marek Siarkowicz
00e1e5db21
tests: Backport tls for etcdctl
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-17 10:50:19 +01:00
Marek Siarkowicz
46d6c1d7b2
tests: Extract e2e test utils
...
Consider creating generic testutils for both e2e and integration tests.
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-16 17:24:42 +01:00
Marek Siarkowicz
2f4d75feb1
tests: Allow specifying http version in curl
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-16 17:24:42 +01:00
Marek Siarkowicz
4e9911ec26
tests: Refactor newClient args
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-16 17:24:42 +01:00
Marek Siarkowicz
64bc55ef4e
tests: Refactor CURLPrefixArgs
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-16 17:24:42 +01:00
Benjamin Wang
11ca1d356a
Merge pull request #15483 from jmhbnz/release-3.5-backport
...
[3.5] Backport tls 1.3 support
2023-03-16 06:06:45 +08:00
James Blair
358bcf3fb6
Backport tls 1.3 support.
...
Signed-off-by: James Blair <mail@jamesblair.net>
2023-03-15 14:10:14 +13:00
Marek Siarkowicz
3a63da9609
Merge pull request #15452 from serathius/watch-random-scheduler-3.5
...
[3.5] Use random scheduler Watch
2023-03-14 10:25:26 +01:00
Marek Siarkowicz
55bfad950c
server: Switch back to random scheduler to improve resilience to watch starvation
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-14 09:16:46 +01:00
Marek Siarkowicz
3f96014d2d
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 09:16:46 +01:00
Marek Siarkowicz
98861410f3
tests: Allow configuring progress notify interval in e2e tests
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-14 09:16:46 +01:00
Benjamin Wang
6ddb23ce7a
Merge pull request #15454 from serathius/gomodtidy-3.5
...
Run go mod tidy
2023-03-14 10:05:38 +08:00
Marek Siarkowicz
e44995e670
Run go mod tidy
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-03-13 16:56:11 +01:00
Benjamin Wang
b10adb6abe
Merge pull request #15428 from jmhbnz/release-3.5-backport
...
[3.5] Backport update to latest go 1.19.7 release
2023-03-08 19:07:11 +08:00
James Blair
f0aa228dbf
Updated go to 1.19.7.
...
Mitigates CVE-2023-24532.
Signed-off-by: James Blair <mail@jamesblair.net>
2023-03-08 22:33:13 +13:00
Piotr Tabor
c602942246
Merge pull request #15337 from jmhbnz/release-3.5
...
[3.5] Backport bump to go 1.19.6 and golang.org/x/net to v0.7.0
2023-03-03 11:08:36 +01:00
James Blair
1ea808b5ba
Backport go_srcs_in_module changes and fix goword failures.
...
Signed-off-by: James Blair <mail@jamesblair.net>
2023-02-24 22:01:41 +13:00
James Blair
183af509f6
Formatted source code for go 1.19.6.
...
Signed-off-by: James Blair <mail@jamesblair.net>
2023-02-20 21:33:59 +13:00
James Blair
1bd835383b
Bump to go 1.19.6
...
Signed-off-by: James Blair <mail@jamesblair.net>
2023-02-20 12:52:43 +13:00
James Blair
5996b5faa3
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 12:51:17 +13:00
Benjamin Wang
d41d8ac1da
test:enhance the test case TestV3WatchProgressOnMemberRestart
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-02-10 21:03:43 +08:00
Benjamin Wang
e896cc7201
clientv3: correct the nextRev on receving progress notification response
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-02-10 16:47:49 +08:00
Marek Siarkowicz
346f1d325a
Merge pull request #15240 from jmhbnz/release-3.5
...
[3.5] Backport adjusting time resolution to microseconds
2023-02-09 13:45:30 +01:00
Marek Siarkowicz
bc5445c00c
Merge pull request #15264 from ahrtr/3.5_walSync_failpoint_20230209
...
[3.5] etcdserver: add failpoints walBeforeSync and walAfterSync
2023-02-09 09:10:05 +01:00
Benjamin Wang
452164a1c7
etcdserver: add failpoints walBeforeSync and walAfterSync
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-02-09 07:03:04 +08:00
Marek Siarkowicz
1664b4f828
Merge pull request #15187 from Kidsan/fix/ipv6-comparisons-release-3.5
...
[3.5] Backport: netutil: consistently format ipv6 addresses
2023-02-03 10:52:54 +01:00
James Blair
b9568dba32
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-03 21:45:45 +13:00
Marek Siarkowicz
238da4b3f5
Merge pull request #15225 from pacoxu/update-cockroachdb/datadriven-etcd3.5
...
upgrade cockroachdb/datadriven to v1.0.2 to remove archived dependencies
2023-01-31 08:51:28 +01:00
Paco Xu
2a0ecd4078
upgrade cockroachdb/datadriven to v1.0.2 to remove archived dependencies
...
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
2023-01-31 14:42:15 +08:00
Benjamin Wang
78e739083e
bump github.com/stretchr/testify to v1.8.1
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-01-31 07:12:46 +08:00
Benjamin Wang
747de58414
bump bbolt to v1.3.7 for release-3.5
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-01-31 07:12:46 +08:00
kidsan
41ed809c38
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-26 11:11:25 +01:00
Iavael
82004d0197
docker: remove nsswitch.conf
...
Signed-off-by: Iavael <905853+iavael@users.noreply.github.com>
2023-01-25 02:46:11 +08:00
Marek Siarkowicz
215b53cf3b
version: bump up to 3.5.7
2023-01-20 11:15:12 +01:00
Marek Siarkowicz
638c6f1bb1
Merge pull request #15096 from ahrtr/3.5_promote_non_exist_id_20230113
...
[3.5] etcdserver: return membership.ErrIDNotFound when the memberID not found
2023-01-17 10:23:03 +01:00
Benjamin Wang
53300ece3b
etcdserver: return membership.ErrIDNotFound when the memberID not found
...
Backport https://github.com/etcd-io/etcd/pull/15095 .
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:24:27 +08:00
Benjamin Wang
816c2e2b8a
Merge pull request #15069 from ahrtr/last_wal_rec_corrupt_3.5_20230108
...
[3.5] etcdserver: process the scenaro of the last WAL record being partially synced to disk
2023-01-11 16:37:43 +08:00
Benjamin Wang
e1fc545d8a
etcdserver: process the scenaro of the last WAL record being partially synced to disk
...
We need to return io.ErrUnexpectedEOF in the error chain, so that
etcdserver can repair it automatically.
Backport https://github.com/etcd-io/etcd/pull/15068
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-01-08 05:30:01 +08:00
