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

17502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wei Fu
ad5a6ea6c6 test.sh: increase timeout for grpcproxy test 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-08-28 21:00:51 +08:00
Wei Fu
68e09defdf test: add v3 curl test to cover maintenance hash/hashkv REST API 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-08-28 21:00:46 +08:00
Wei Fu
83bf5dcb20 api: fix duplicate gateway url issue 
Run `scripts/genproto.sh --skip-protodoc` and checkout
server/wal/walpb/record.pb.go because we still use go.etcd.io/etcd/raft/v3
instead of go.etcd.io/raft/v3.

Before

```
➜  etcd git:(release-3.5) etcdctl put foo bar
OK
➜  etcd git:(release-3.5) etcdctl get -w json foo
{"header":{"cluster_id":14841639068965178418,"member_id":10276657743932975437,"revision":2,"raft_term":2},"kvs":[{"key":"Zm9v","create_revision":2,"mod_revision":2,"version":1,"value":"YmFy"}],"count":1}

➜  etcd git:(release-3.5) etcdctl compact 2
compacted revision 2

➜  etcd git:(release-3.5) http_proxy= curl -L http://127.0.0.1:2379/v3/maintenance/hashkv -X POST -d '{"revsion":2}'
Not Found
```

After

```bash
➜  etcd git:(bp-16464) http_proxy= curl -L http://127.0.0.1:2379/v3/maintenance/hashkv -X POST -d '{"revsion":2}'
{"header":{"cluster_id":"14841639068965178418","member_id":"10276657743932975437","revision":"2","raft_term":"3"},"hash":3305255506,"compact_revision":"2"}%
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2023-08-28 00:10:33 +08:00
Benjamin Wang
9e0e491dbd
Merge pull request #16476 from new-dream/release-3.5-CVE-2022-34038 
[3.5] add a verification on the pagebytes which must be > 0
 2023-08-27 23:47:57 +08:00
new-dream
7b8de8194b pkg: add a verification on the pagebytes which must be > 0 
Signed-off-by: n00607095 <niechangxu1@huawei.com>
 2023-08-25 22:02:45 +08:00
Benjamin Wang
6186538c0c
Merge pull request #16444 from jmhbnz/deflake-testpagewriterrandom 
[3.5] tests: Backport recent test flake fixes
 2023-08-21 15:48:46 +08:00
James Blair
b9e5d9666a
tests: Backport deflake for TestWatchDelay 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-19 21:41:56 +12:00
James Blair
778f2260b1
tests: Backport deflake for TestPageWriterRandom 
The PageWriter has cache buffer so that it doesn't call the Writer until
the cache is almost full. Since the data's length is random, the pending
bytes should be always less than cache buffer size, instead of page
size.

Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-19 21:41:18 +12:00
Benjamin Wang
0b598c4538
Merge pull request #16435 from jmhbnz/backport-expose-socket-options 
[3.5] Backport expose socket options
 2023-08-18 17:13:05 +08:00
James Blair
164175dfe3
Backport adding unit test for socket options. 
Co-authored-by: Shawn Gerrard <shawn.gerrard@gmail.com>
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-18 19:14:57 +12:00
James Blair
2a7bffc63e
Backport export reuse-port and reuse-address 
so that they cabn be configured via config file.

Co-authored-by: Shawn Gerrard <shawn.gerrard@gmail.com>
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-18 12:05:19 +12:00
Benjamin Wang
2d2e75dd8e
Merge pull request #16401 from jmhbnz/update-to-go-1.20 
[3.5] Backport update to golang 1.20 minor release
 2023-08-17 19:11:43 +08:00
James Blair
f62a894ae7
Fix goword failure in rafthttp/transport.go. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-11 21:47:30 +12:00
James Blair
9c7c8c6b3f
Backport update to golang 1.20 minor release. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-11 21:16:01 +12:00
Benjamin Wang
5d7c457873
Merge pull request #16262 from CaojiamingAlan/add_UnsafeReadScheduledCompact_and_UnsafeReadFinishedCompact 
[3.5] Add UnsafeReadScheduledCompact and UnsafeReadFinishedCompact
 2023-08-03 13:16:15 +01:00
Marek Siarkowicz
81ed2b3cf7
Merge pull request #16340 from jmhbnz/streamline-test-commands 
[3.5] Backport Makefile recipes for common test commands
 2023-08-02 15:54:21 +02:00
Benjamin Wang
d3df4d5365
Merge pull request #16352 from z764969689/release-3.5 
Backport "bump go version to 1.19.12" to release-3.5
 2023-08-02 09:39:33 +01:00
Luke Zhang
de0df43c42 bump go version to 1.19.12 
Signed-off-by: Luke Zhang <z764969689@163.com>
 2023-08-02 15:33:10 +08:00