17570 Commits

Author SHA1 Message Date
Marek Siarkowicz
46e394242f server: Split metrics and health code
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
8ab1c0f25b server: Cover V3 health with tests
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
9db8ddbb8c server: Refactor health checks
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
eed94f6f94 server: Run health check tests in subtests
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
2f6c84e91d server: Rename test case expect fields
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
c6784a7e82 server: Use named struct initialization in healthcheck test
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
James Blair
9e21048c4b
Backport server: Don't follow redirects when checking peer urls.
It's possible that etcd server may run into SSRF situation when adding a new member. If users provide a malicious peer URL, the existing etcd members may be redirected to other unexpected internal URL when getting the new member's version.

Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-27 21:48:50 +13:00
Marek Siarkowicz
0e64a6d40e
Merge pull request #16951 from jmhbnz/fix-distributed-tracing
[3.5] Backport add sampling rate to fix distributed tracing
2023-11-26 15:02:13 +01:00
James Blair
f952197890
Backport embed: Add tracing integration test.
Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-26 10:30:49 +13:00
James Blair
5a564d56d7
Backport server: Have tracingExporter own resources it initialises.
Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-26 10:22:10 +13:00
James Blair
3a54851f48
Backport server: Add sampling rate to distributed tracing.
ExperimentalDistributedTracingSamplingRatePerMillion is the
number of samples to collect per million spans.
Defaults to 0.

Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-26 10:22:10 +13:00
Benjamin Wang
0b46d431ec
Merge pull request #16921 from ivanvc/enable-arm64-builds-for-every-push-and-pr-in-release-3.5
github workflow: run arm64 tests on every push
2023-11-20 17:00:32 +00:00
Benjamin Wang
a733d92c5e
Merge pull request #16946 from sharathsivakumar/release-3.5
[3.5] CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.open…
2023-11-16 07:38:57 +00:00
sharath sivakumar
7f7b91508d upgrade github.com/stretchr/testify,google.golang.org/genproto/googleapis/api,google.golang.org/grpc to make it consistent
Signed-off-by: sharath sivakumar <sharath.sivakumar@mollie.com>
2023-11-15 17:10:40 +01:00
sharath sivakumar
f26074ae56 CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@v0.46.0
Signed-off-by: sharath sivakumar <sharath.sivakumar@mollie.com>
2023-11-15 14:09:07 +01:00
Ivan Valdes
f9f38bc97a
github workflow: run arm64 tests on every push
Use a template to consolidate arm64 and amd64 test workflows. Enable
running armd64 tests on every push and pull request.

Signed-off-by: Ivan Valdes <ivan@vald.es>
2023-11-13 16:56:29 -08:00
Benjamin Wang
a0cb92e8b9
Merge pull request #16915 from arjunmalhotra1/release-3.5
[3.5] etcd: upgrade go version from 1.20.10 to 1.20.11
2023-11-13 09:31:49 +00:00
arjunmalhotra1
e1aa1b97af etcd: upgrade go version from 1.20.10 to 1.20.11
To keep etcd projects up to date with the latest patch releases &
incorporate the latest security updates.

Signed-off-by: arjunmalhotra1 <am2cj@virginia.edu>
2023-11-12 17:45:27 -06:00
Marek Siarkowicz
0223ca52b8 version: bump up to 3.5.10 v3.5.10 tests/v3.5.10 etcdctl/v3.5.10 etcdutl/v3.5.10 server/v3.5.10 client/v3.5.10 client/v2.305.10 client/pkg/v3.5.10 raft/v3.5.10 pkg/v3.5.10 api/v3.5.10 2023-10-27 12:33:25 +02:00
Marek Siarkowicz
aa04f5d3c1
Merge pull request #16833 from ahrtr/bump_bbolt_1.3.8_20231026
[3.5] Bump bbolt to 1.3.8 for release-3.5
2023-10-27 09:57:12 +02:00
Benjamin Wang
88beb6ca47 bump bbolt to 1.3.8 for etcd 3.5
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-10-26 16:32:07 +01:00
Benjamin Wang
3521aaad9a
Merge pull request #16790 from chaochn47/3.5-grpc-update
[3.5] Upgrade gRPC-go to 1.58.3
2023-10-19 10:21:36 +01:00
Marek Siarkowicz
31b7c58fd5
Merge pull request #16637 from serathius/check-cluster-id-release-3.5
[release-3.5] etcdserver: add cluster id check for hashKVHandler
2023-10-17 20:58:21 +02:00
Chao Chen
1aa4aa8a96 3.5: upgrade gRPC-go to 1.58.3
The last step with gRPC update behavior changes auditing to resolve CVE #16740 in 3.5

This PR backports #14922, #16338, #16587, #16630, #16636 and #16739 to release-3.5.

Signed-off-by: Chao Chen <chaochn@amazon.com>
2023-10-17 11:07:08 -07:00
Marek Siarkowicz
5b8150a6cf Backport corrupt check test fix "etcd server shouldn't wait for the ready notification infinitely on startup"
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-10-17 14:37:14 +02:00
Marek Siarkowicz
4cf9ef8574
Merge pull request #16070 from kkkkun/rm-stack-log
remove stack log when restore snapshot
2023-10-17 13:41:33 +02:00
caojiamingalan
04cfb4c660 etcdserver: add cluster id check for hashKVHandler
Signed-off-by: caojiamingalan <alan.c.19971111@gmail.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-10-17 13:27:47 +02:00
Marek Siarkowicz
976378c99f
Merge pull request #16781 from chaochn47/release-3.5-backport-gRPC-update
[release-3.5]: upgrade gRPC-go to v1.52.0
2023-10-17 13:03:17 +02:00
Chao Chen
6f4fa5a27a [release-3.5]: upgrade gRPC-go to v1.52.0
backport https://github.com/etcd-io/etcd/pull/14834 and https://github.com/etcd-io/etcd/pull/16324

Signed-off-by: Chao Chen <chaochn@amazon.com>
2023-10-16 21:43:00 -07:00
Wenjia
3921831cdb
Merge pull request #16625 from chaochn47/release-3.5-backport-gRPC-go-updates
[3.5] Bump grpc-go to1.47 (and fix the connection-string format)
2023-10-16 12:08:07 -07:00
Chao Chen
db16069588 backport #14125 to release-3.5: Update to grpc-1.47 (and fix the connection-string format)
Signed-off-by: Chao Chen <chaochn@amazon.com>
2023-10-12 09:46:49 -07:00
Marek Siarkowicz
9776ceca10
Merge pull request #16750 from serathius/roundrobin-3.5
[v3.5] Return to default write scheduler since golang.org/x/net@v0.11.0 started using round robin
2023-10-12 17:17:14 +02:00
Marek Siarkowicz
404eeaa74e Return to default write scheduler since golang.org/x/net@v0.11.0 started using round robin
Introduction of round robin 120fc906b3
Added in v0.10.0 https://github.com/golang/net/compare/v0.10.0...v0.11.0

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-10-12 15:19:17 +02:00
Marek Siarkowicz
c669e0cd0e
Merge pull request #16743 from dusk125/3.5-http2
[3.5] Bump golang.org/x/net to v0.17.0
2023-10-12 15:12:48 +02:00
Benjamin Wang
246f2a8461
Merge pull request #16745 from dusk125/gobump-3.5
[3.5] Bump go to v1.20.10
2023-10-11 16:34:36 +01:00
Allen Ray
b916aff9ed Bump go to v1.20.10
Part of https://github.com/etcd-io/etcd/issues/16740

Signed-off-by: Allen Ray <alray@redhat.com>
2023-10-11 11:07:02 -04:00
Allen Ray
24ee8e491f bump golang.org/x/net to 0.17.0
Part of https://github.com/etcd-io/etcd/issues/16740

Signed-off-by: Allen Ray <alray@redhat.com>
2023-10-11 10:43:51 -04:00
Benjamin Wang
c8286f47ef
Merge pull request #16730 from 0scvr/0scvr/upgrade-r3.5-go-1.20.9
[3.5] Upgrade go version to 1.20.9
2023-10-10 09:48:40 +01:00
0scvr
19a6ec1ced etcd: upgrade go version to 1.20.9
To be up to date with the newest security fix.

Signed-off-by: 0scvr <71343264+0scvr@users.noreply.github.com>
2023-10-09 23:37:24 +02:00
Benjamin Wang
7ed8970e2d
Merge pull request #16562 from MeenuyD/go-version-update
fix:Ensure that go version is only defined in one file for release-3.5
2023-09-11 11:06:57 +01:00
Marek Siarkowicz
890af4c663
Merge pull request #16565 from fuweid/35-cp-13824
[3.5] Fix panic in etcd validate secure endpoints
2023-09-11 10:30:49 +02:00
Benjamin Wang
635219a31b
Merge pull request #16568 from jmhbnz/fix-release-35-cmux
[3.5] Backport removing obsolete http 1.0 version for cmux tests
2023-09-10 11:17:07 +01:00
James Blair
bfb3494c06
Remove obsolete http 1.0 version.
From TestConnectionMultiplexing to ensure the test will run successfully in Debian 12.

Signed-off-by: James Blair <mail@jamesblair.net>
2023-09-10 21:02:38 +12:00
MeenuyD
078b080786 fix:Ensure that go version is only defined in one file for release-3.5
Signed-off-by: MeenuyD <meenu.coninja@gmail.com>
2023-09-09 20:03:18 +05:30
Wei Fu
7816df7f92 Fix panic in etcd validate secure endpoints
Backport: #13824

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2023-09-09 21:06:33 +08:00
Benjamin Wang
c8d06bb99b
Merge pull request #16555 from ahrtr/3.5_golang_20230908
[3.5] dependency: bump golang to 1.20.8
2023-09-08 18:20:56 +01:00
Benjamin Wang
bdae1d390f dependency: bump golang to 1.20.8
Signed-off-by: Benjamin Wang <wachao@vmware.com>
2023-09-08 17:50:49 +01:00
Marek Siarkowicz
630401e074
Merge pull request #16550 from jmhbnz/backport-redirecting-metrics-to-file
[3.5] Backport redirecting cmux test metrics data into file to reduce output
2023-09-07 13:57:38 +02:00
James Blair
baa580a0b6
Backport redirect metrics data into file to reduce output.
Signed-off-by: James Blair <mail@jamesblair.net>
2023-09-07 20:42:03 +12:00
Benjamin Wang
182e352298
Merge pull request #16490 from fuweid/bp-16464
[3.5] api: fix duplicate gateway url issue
2023-08-30 17:07:54 +08:00