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

16115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Wang
ff2304879e Bump version to 3.4.30 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
v3.4.30 		2024-01-31 13:09:19 +00:00
Marek Siarkowicz
8bd1facbe2
Merge pull request #17347 from serathius/crypto-3.4 
[release-3.4] Bump golang.org/x/crypto to v0.17+ to address CVE-2023-48795
 2024-01-31 11:20:58 +01:00
Marek Siarkowicz
b6b36c94ab Bump golang.org/x/crypto to v0.17+ to address CVE-2023-48795 
This is the minimal set of package updates I get after:

taking packages from release-3.5 with golang.org/x/crypto@v0.17.0
slowly downgrading package by package to get minimal changes
running make to make sure other dependencies don't change

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2024-01-31 10:51:24 +01:00
Benjamin Wang
d14f794a33
Merge pull request #17321 from ahrtr/3.4_TestHashKVWhenCompacting_20240125 
[3.4] test: fix `TestHashKVWhenCompacting`: ensure all goroutine finished
 2024-01-26 10:37:32 +00:00
Benjamin Wang
6b774527c3 test: fix TestHashKVWhenCompacting: ensure all goroutine finished 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
 2024-01-25 13:33:22 +00:00
Benjamin Wang
1d67e9efea
Merge pull request #17316 from ahrtr/3.4_configure_peer_log_20240124 
[3.4] Print error log when creating peer listener failed
 2024-01-25 10:05:52 +00:00
Benjamin Wang
5c3a36d813 print error log when creating peer listener failed 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
 2024-01-24 13:56:02 +00:00
Benjamin Wang
7555d0ce9e
Merge pull request #17276 from ivanvc/3.4-update-golang-to-1.20.13 
[3.4] dependency: update go to 1.20.13
 2024-01-23 14:14:46 +00:00
Benjamin Wang
62e51c4b86
Merge pull request #17304 from fuweid/fix-17241 
[3.4] fix: linux-amd64-e2e job timeout issue
 2024-01-23 14:14:01 +00:00
Wei Fu
c74cc42e6b fix: linux-amd64-e2e job timeout issue 
Assume #16916 as baseline. The E2E takes `1395.082s`.

* https://github.com/etcd-io/etcd/pull/16988

It introduced `TestAuthority` which takes `18.39s`.
And after https://github.com/etcd-io/etcd/pull/16997, it takes `50.05s`.

* https://github.com/etcd-io/etcd/pull/16995

It introduced `TestInPlaceRecovery` which takes `17.37s`.

* https://github.com/etcd-io/etcd/pull/17144

  - New `TestHTTPHealthHandler` takes `29.9s`
  - New `TestHTTPLivezReadyzHandler` takes `35.20s`

* https://github.com/etcd-io/etcd/pull/17173

  - New `TestMemberReplace` takes `7.55s`.

Ideally, it should increase `140.07s`. It's not larger than `1800s`
timeout value.

However, we run E2E cases 3 times. By default, we run E2E cases with
`-cpu 1,2,4`. That means that we run 3 times.

`1395.082s` + `140.07s * 3` = `1815.292s` > `1800s`

```bash
$ go help testflag

 -count n
            Run each test, benchmark, and fuzz seed n times (default 1).

            If -cpu is set, run n times for each GOMAXPROCS value.
            Examples are always run once. -count does not apply to
            fuzz tests matched by -fuzz.
```

I don't think we should run E2E with different GOMAXPROCS value. All the
`TestXYZ` are used to control etcd process and we don't set GOMAXPROCS
env to etcd process.

Set `CPU=4` to align with main and release/3.5.

Closes: #17241

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2024-01-23 19:23:32 +08:00
Ivan Valdes
5d0fbafcd3
dependency: update go to 1.20.13 
Signed-off-by: Ivan Valdes <ivan@vald.es>
 2024-01-18 16:13:43 -08:00
Benjamin Wang
d441d74c0a
Merge pull request #17270 from ahrtr/nil_log_20240118 
[3.4] Use the correct log library to print log messages to prevent nil pointer panicking
 2024-01-18 18:03:02 +00:00
Benjamin Wang
9009d3ec7f use the correct log library to print log messages 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
 2024-01-18 10:18:25 +00:00
Benjamin Wang
071cb43190
Merge pull request #17242 from jmhbnz/backport-reproducible-image-builds 
[3.4] Backport adding digest for etcd base image
 2024-01-15 13:58:13 +00:00
James Blair
62b2229a03
Backport adding digest for etcd base image. 
To ensure etcd official image builds can be reproduced.

Signed-off-by: James Blair <mail@jamesblair.net>
 2024-01-15 19:46:25 +13:00
Benjamin Wang
6caef6ca48
Merge pull request #17238 from siyuanfoundation/txBuf-3.4 
[3.4] Fix delete inconsistencies in read buffer
 2024-01-14 18:50:35 +00:00
Siyuan Zhang
b70684b93d commit bbolt transaction if there is any pending deleting operations 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2024-01-12 09:23:14 -08:00
Siyuan Zhang
c3af9427ed add tests to test tx delete consistency. 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2024-01-12 09:22:55 -08:00
Benjamin Wang
148ba41c5c
Merge pull request #17173 from ZhouJianMS/member-replace-3.4 
[3.4] member replace e2e test
 2024-01-12 09:51:04 +00:00
ZhouJianMS
2f8d7d0381 member replace e2e test 
Signed-off-by: ZhouJianMS <zhoujian@microsoft.com>
 2024-01-10 15:45:26 +08:00
Benjamin Wang
3ee15038fd bump version to 3.4.29 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
v3.4.29 		2024-01-09 13:11:45 +00:00
Marek Siarkowicz
8c185ee271
Merge pull request #17208 from serathius/dont-flock-3.4 
[release-3.4] Don't flock snapshot files
 2024-01-08 16:12:17 +01:00
Marek Siarkowicz
73814a46f9 Don't flock snapshot files 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2024-01-08 15:11:44 +01:00
Benjamin Wang
c7eab9d4fa
Merge pull request #17202 from ishan16696/Backport-PR16465-3.4 
[3.4]Add a unit tests and missing flags in etcd help.
 2024-01-05 10:01:27 +00:00
Ishan Tyagi
06d7312c73 Add a unit tests and missing flags in etcd help. 
Signed-off-by: ishan16696 <ishan.tyagi@sap.com>
 2024-01-05 14:58:27 +05:30
Marek Siarkowicz
2664430d7e
Merge pull request #17189 from ishan16696/add/missingFlag 
[3.4] Add missing `experimental-enable-lease-checkpoint-persist` flag in etcd help
 2024-01-03 11:40:39 +01:00
Ishan Tyagi
a89ac3ccda Add missing flag in etcd help. 
Signed-off-by: ishan16696 <ishan.tyagi@sap.com>
 2024-01-02 18:00:31 +05:30
Benjamin Wang
f06c6e6189
Merge pull request #17144 from siyuanfoundation/livez-bp-3.4-e2e 
[3.4] Backport e2e tests for livez/readyz.
 2023-12-21 19:12:57 +00:00
Siyuan Zhang
5ca4d8ccf2 [3.4] enable gofail in e2e test. 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-21 09:34:17 -08:00
Siyuan Zhang
c43530c402 [3.4] backport health check e2e tests. 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-21 09:33:11 -08:00
Benjamin Wang
b03b6da8a8
Merge pull request #17154 from serathius/fix-bootstrap-3.4 
[release-3.4] Check if be is nil to avoid panic when be is overriden with nil
 2023-12-21 09:23:17 +00:00
Marek Siarkowicz
6723e3cc44 Check if be is nil to avoid panic when be is overriden with nil by recoverSnapshotBackend on line 471 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
 2023-12-20 17:01:01 +01:00
Benjamin Wang
2a07f80f77
Merge pull request #17128 from siyuanfoundation/livez-bp-3.4-step2 
[3.4] Backport livez/readyz
 2023-12-19 09:10:12 +00:00
Siyuan Zhang
b6ab23900d etcdserver: add linearizable_read check to readyz. 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-15 14:00:22 -08:00
Siyuan Zhang
c58ef8d10f etcdserver: add metric counters for livez/readyz health checks. 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-15 08:39:51 -08:00
Siyuan Zhang
f4c229a41d etcdserver: add livez and ready http endpoints for etcd. 
Add two separate probes, one for liveness and one for readiness. The liveness probe would check that the local individual node is up and running, or else restart the node, while the readiness probe would check that the cluster is ready to serve traffic. This would make etcd health-check fully Kubernetes API complient.

Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-15 08:39:51 -08:00
Chao Chen
d4861d660b http health check bug fixes 
Signed-off-by: Chao Chen <chaochn@amazon.com>
 2023-12-15 08:39:51 -08:00
Benjamin Wang
963af731bd
Merge pull request #17120 from siyuanfoundation/livez-bp-3.4 
[3.4] Backport healthcheck code cleanup
 2023-12-15 09:52:50 +00:00
Marek Siarkowicz
4a8381a461 server: Split metrics and health code 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-14 10:25:43 -08:00
Siyuan Zhang
cc44646a2e server: Cover V3 health with tests 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-14 10:23:49 -08:00
Siyuan Zhang
f009772c84 server: Refactor health checks 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-14 10:23:36 -08:00
Benjamin Wang
4fe68b4016
Merge pull request #17112 from ivanvc/release-3.4-backport-ssrf 
[3.4] Backport disable redirects in peer communication
 2023-12-13 19:30:13 +00:00
Ivan Valdes
838cd9aa00
server: disable redirects in peer communication 
Disable following redirects from peer HTTP communication on the client's side.
Etcd server may run into SSRF (Server-side request forgery) when adding a new
member. If users provide a malicious peer URL, the existing etcd members may be
redirected to another unexpected internal URL when getting the new member's
version.

Signed-off-by: Ivan Valdes <ivan@vald.es>
 2023-12-13 09:21:53 -08:00
Marek Siarkowicz
e74970d5a1 server: Run health check tests in subtests 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-11 17:07:09 -08:00
Marek Siarkowicz
34d2e743d2 server: Rename test case expect fields 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-11 17:04:08 -08:00
Marek Siarkowicz
ddf7a69fba server: Use named struct initialization in healthcheck test 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
 2023-12-11 17:03:48 -08:00
Benjamin Wang
39b440caed
Merge pull request #17076 from jonasrdl/release-3.4-update-to-go-1.21.5 
[3.4] Update go version to 1.20.12
 2023-12-06 20:10:06 +00:00
Jonas Riedel
ab34e01f34 etcd: Update go version to 1.20.12 
Signed-off-by: Jonas Riedel <jonasriedel@pm.me>
 2023-12-06 20:08:24 +01:00
Benjamin Wang
adf6bd245b Bump version to 3.4.28 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
v3.4.28 		2023-11-23 14:29:31 +00:00
Benjamin Wang
75d2407fc0
Merge pull request #16990 from YaoC/backport-12890 
[3.4] backport #12890 learner support snapshot RPC
 2023-11-23 13:56:28 +00:00