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

17482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
James Blair
0d829e4bcd
Update workflows to use makefile recipes for unit, integration & e2e-release. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-02 14:43:40 +12:00
James Blair
84b85a0f0d
Backport Makefile recipes for common test commands. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-08-02 09:12:36 +12:00
Benjamin Wang
b9248914cf
Merge pull request #16311 from gocurr/release-3.5 
[3.5] Backport #16272 to 3.5
 2023-07-27 09:03:09 +01:00
Jes Cok
5df43d9730 pkg/flags: fix UniqueURLs'Set to remove duplicates in UniqueURLs'uss 
From the name of func 'UniqueURLsFromFlag', we can tell that UniqueURLs'uss
should not have duplicates. The current implemention of UniqueURLs'Set
has a bug to make it unique.

Fixes: #16307.

Signed-off-by: Jes Cok <xigua67damn@gmail.com>
 2023-07-26 21:37:32 +08:00
Marek Siarkowicz
7ba4addd87
Merge pull request #16280 from jmhbnz/backport-e2e-release-fix 
Backport fix to e2e release version identifcation
 2023-07-24 12:04:55 +02:00
James Blair
f9ae5f8023
Backport fix to e2e release version identifcation. 
Signed-off-by: James Blair <mail@jamesblair.net>
 2023-07-22 11:00:45 +12:00
Benjamin Wang
679820aa0e
Merge pull request #16270 from CaojiamingAlan/init_client_error 
Backport #14368 to v3.5
 2023-07-19 19:57:30 +01:00
caojiamingalan
a4fa4d3d34 Backport #14368 to v3.5 
Signed-off-by: caojiamingalan <alan.c.19971111@gmail.com>
 2023-07-18 14:53:08 -05:00
caojiamingalan
eb9bfaa983 Follow up https://github.com/etcd-io/etcd/pull/16068#discussion_r1263667496 
Add a UnsafeReadScheduledCompact and UnsafeReadFinishedCompact

Signed-off-by: caojiamingalan <alan.c.19971111@gmail.com>
 2023-07-18 10:54:16 -05:00
Benjamin Wang
8f4b6c9ed2
Merge pull request #16068 from CaojiamingAlan/release-3.5 
[3.5] etcdserver: backport check scheduledCompactKeyName and finishedCompac…
 2023-07-15 10:11:34 +01:00
caojiamingalan
6ac9d94d67 etcdserver: backport check scheduledCompactKeyName and finishedCompactKeyName before writing hash to release-3.5. 
Fix #15919.
Check ScheduledCompactKeyName and FinishedCompactKeyName
before writing hash to hashstore.
If they do not match, then it means this compaction has once been interrupted and its hash value is invalid. In such cases, we won't write the hash values to the hashstore, and avoids the incorrect corruption alarm.

Signed-off-by: caojiamingalan <alan.c.19971111@gmail.com>
 2023-07-14 19:22:38 -05:00
Benjamin Wang
9ac1d7378a
Merge pull request #16241 from liangyuanpeng/backport_13577_3.5 
[3.5] Backport #13577 to 3.5
 2023-07-14 16:08:51 +01:00
Benjamin Wang
c7d9708387
Merge pull request #16204 from kensou97/release-3.5 
[3.5] clientv3: create keepAliveCtxCloser goroutine only if ctx can be canc…
 2023-07-14 13:46:38 +01:00
Benjamin Wang
f3e1156a21
Merge pull request #16227 from ahrtr/go_3.5_20230712 
[3.5] Bump go version to 1.19.11 to fix CVE GO-2023-1878
 2023-07-14 11:13:52 +01:00
Lan Liang
960cd26bef Backport #13577 
Disable auth gracefully without impacting existing watchers.

Signed-off-by: Lan Liang <gcslyp@gmail.com>
 2023-07-14 12:50:21 +08:00
Benjamin Wang
9fa58bfc0e bump go version to 1.19.11 to fix CVE GO-2023-1878 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
 2023-07-12 16:54:34 +01:00
zhangwenkang
4d7b7e5fcd clientv3: create keepAliveCtxCloser goroutine only if ctx can be canceled 
Signed-off-by: zhangwenkang <zwenkang@vmware.com>
 2023-07-10 23:17:05 +08:00
Benjamin Wang
d4f779a643
Merge pull request #16201 from Tachone/release-3.5 
[Backport 3.5] etcdutl: fix db double closed
 2023-07-10 11:15:05 +01:00
shitao.lst
2921992cbd [3.5] etcdutl: fix db double closed 
Signed-off-by: shitao.lst <acm_tach@163.com>
 2023-07-10 15:13:13 +08:00