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
v3.5.7
tests/v3.5.7
etcdctl/v3.5.7
etcdutl/v3.5.7
server/v3.5.7
client/v3.5.7
client/v2.305.7
client/pkg/v3.5.7
raft/v3.5.7
pkg/v3.5.7
api/v3.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
Benjamin Wang
9e3966fbce
Merge pull request #15041 from ahrtr/update_nsswitch_3.5
...
[3.5] Update nsswitch.conf for 3.5
2022-12-24 07:13:18 +08:00
Benjamin Wang
cff304502c
update nsswitch.conf for 3.5
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-23 20:30:23 +08:00
Benjamin Wang
dd30268727
Merge pull request #15037 from ahrtr/remove_busybox_3.5_20221223
...
3.5: remove the dependency on busybox
2022-12-23 19:27:46 +08:00
Benjamin Wang
1293f5d4b7
3.5: remove the dependency on busybox
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-23 18:38:40 +08:00
Benjamin Wang
f12f162587
Merge pull request #15018 from ahrtr/deps_3.5_20221219
...
[3.5] Security: address HIGH Vulnerabilities
2022-12-19 17:41:52 +08:00
Piotr Tabor
cf379a79ea
Merge pull request #14920 from andy-js/andy-js/release-3.5
...
client/pkg/v3: fixes Solaris build of transport
2022-12-19 09:24:56 +01:00
Benjamin Wang
4e0385134e
Merge pull request #15016 from ahrtr/use_distroless_3.5_20221219
...
[3.5] Security: use distroless base image to address critical Vulnerabilities
2022-12-19 16:23:15 +08:00
Benjamin Wang
925c0611e0
Remove dependency on gobin
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-19 16:16:55 +08:00
Benjamin Wang
413ec16175
resolve build error: parameter may not start with quote character '
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-19 13:28:25 +08:00
Benjamin Wang
bf1b902111
remove .travis.yml
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-19 13:27:19 +08:00
Benjamin Wang
a612b9285f
format the source code and tidy the dependencies using go 1.17.13
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-19 13:26:59 +08:00
Benjamin Wang
69ee8a83ab
bump go version to 1.17.13
...
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-19 13:23:16 +08:00
Benjamin Wang
3337f35f17
deps: bump golang.org/x/net to v0.4.0 to address CVEs
...
CVE-2021-44716
CVE-2022-27664
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-19 09:28:07 +08:00
Benjamin Wang
b766840c3b
security: use distroless base image to address critical Vulnerabilities
...
Command:
trivy image --severity CRITICAL gcr.io/etcd-development/etcd:v3.5.6 -f json -o 3.5.6_image_critical.json
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-19 07:59:32 +08:00
Benjamin Wang
410a987cbf
Merge pull request #15010 from 4everming/fix/Specify_branch_name_for_the_Trivy_Scan_in_release3.5
...
fix: specify the correct branch name of release-3.5 in workflow for…
2022-12-17 16:13:36 +08:00
zsimon
d178292fec
cidc: specify the correct branch name of release-3.5 in workflow for trivy nightly scan
...
To checkout the corresponding branch in cicd workflow. Specify the correct branch name in each branch.
Signed-off-by: zsimon <zsimon@vmware.com>
2022-12-17 15:30:26 +08:00
Benjamin Wang
3b7248bc87
Merge pull request #15006 from ArkaSaha30/trivy-release-3-5
...
Add trivy nightly scan for `release-3.5`
2022-12-16 13:59:33 +08:00
ArkaSaha30
4d3c840a9b
Add trivy nightly scan for release-3.5
...
Signed-off-by: ArkaSaha30 <arkasaha30@gmail.com>
2022-12-16 10:59:14 +05:30
Hitoshi Mitake
f1842b6ecf
Merge pull request #14995 from ahrtr/revert_14322_20221215
...
clientv3: revert the client side change in 14547
2022-12-15 09:39:35 +09:00
Benjamin Wang
1fdfb4292c
clientv3: revert the client side change in 14547
...
In order to fix https://github.com/etcd-io/etcd/issues/12385 ,
PR https://github.com/etcd-io/etcd/pull/14322 introduced a change
in which the client side may retry based on the error message
returned from server side.
This is not good, as it's too fragile and it's also changed the
protocol between client and server. Please see the discussion
in https://github.com/kubernetes/kubernetes/pull/114403
Note: The issue https://github.com/etcd-io/etcd/issues/12385 only
happens when auth is enabled, and client side reuse the same client
to watch.
So we decided to rollback the change on 3.5, reasons:
1.K8s doesn't enable auth at all. It has no any impact on K8s.
2.It's very easy for client application to workaround the issue.
The client just needs to create a new client each time before watching.
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2022-12-15 02:12:49 +08:00