Commit Graph

16138 Commits

Author SHA1 Message Date
Benjamin Wang
ff278c49c4 Merge pull request #17465 from ivanvc/release-3.4-backport-ignore-old-leader-leases-revoking-requests
[3.4] backport ignore old leader leases revoking requests
2024-02-22 09:50:25 +00:00
Ivan Valdes
bf04c67408 Backport ignore old leader's leases revoking request
Backport of PR #16822, commits f7e488dc92,
67f17166bf,
and f7ff898fd6.

Co-authored-by: Benjamin Wang <benjamin.wang@broadcom.com>
Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-02-20 11:31:29 -08:00
Ivan Valdes
9a3450ae74 tests/e2e: backport e2e cluster setup
Finish backporting the remaining functions from the original backport
from PR #15620.

Backport of commit 65add8cec4.

Co-authored-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-02-20 11:31:29 -08:00
Ivan Valdes
fd228f2c27 test/e2e: fix WaitLeader backport
Fixes the incorrect backport of WaitLeader, as spawnJsonCmd receives an
expected output string as an argument, which wasn't provided in the
first backport implementation.

Original backport of commit 371179e292 from
PR #17398.

Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-02-20 11:29:44 -08:00
Benjamin Wang
c057f47833 Merge pull request #17330 from siyuanfoundation/3.4-downgrade
[3.4] allow downgrade from 3.5
2024-02-20 18:45:38 +00:00
Siyuan Zhang
2caf0f0a12 Add schema verification when closing etcd.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-02-20 08:55:55 -08:00
Siyuan Zhang
83f97c1f46 Add handling of AuthStatusRequest.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-02-20 08:55:55 -08:00
Siyuan Zhang
c65c1ea559 Add function to migrate 3.5 data online.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-02-20 08:55:55 -08:00
Bogdan Kanivets
e7da7ebf7e add flag to allow downgrade from 3.5
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-02-20 08:55:55 -08:00
Benjamin Wang
26620387c7 Merge pull request #17432 from ivanvc/release-3.4-implement-etcd-process-go-fail-client-timeout
[3.4] backport EtcdProcess GoFailClientTimeout
2024-02-16 08:46:00 +00:00
Benjamin Wang
c5cb7aab0f Merge pull request #17436 from jmhbnz/backport-logging-database-metrics-during-compaction
[3.4] mvcc: Printing etcd backend database related metrics inside scheduleCompaction function
2024-02-16 08:44:45 +00:00
James Blair
e5bc8b00ae mvcc: Printing etcd backend database related metrics inside scheduleCompaction function
Backporting commit 21bbc82 to etcd 3.4
To improve traceability of backend database usage, Added below parameter
related to backend database usage metrics inside scheduledCompaction
function.
current-db-size-bytes
current-db-size
current-db-size-in-use-bytes
current-db-size-in-use

Signed-off-by: James Blair <mail@jamesblair.net>
2024-02-16 21:08:20 +13:00
Ivan Valdes
ec4128af69 tests/e2e: implement EtcdProcess GoFailClientTimeout
Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-02-15 10:50:26 -08:00
Benjamin Wang
6affeed9fd Merge pull request #17422 from ArkaSaha30/configure_cgo_3.4
[3.4] Make CGO_ENABLED configurable
2024-02-14 10:19:40 +00:00
Arka Saha
387ca62ccf Make CGO_ENABLED configurable for etcd 3.4
Signed-off-by: Arka Saha <arkas1@vmware.com>
2024-02-13 22:34:33 +05:30
Benjamin Wang
380175a9d4 Merge pull request #17398 from ivanvc/3.4-backport-e2e-waitleader
[3.4] tests/e2e: backport WaitLeader
2024-02-09 10:33:55 +00:00
Ivan Valdes
9c067a3c36 tests/e2e: backport WaitLeader
Add Etcdctl function to etcdProcess interface, and implement it in
etcdServerProcess, which is used by WaitMembersForLeader.

Define Etcdctl's Status function, that is used by WaitMembersForLeader
too.

Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-02-08 16:34:33 -08:00
Benjamin Wang
1a6eaca539 Merge pull request #17383 from fuweid/backport-17365-to-34
[3.4] etcdserver: drain leaky goroutines before test completed
2024-02-06 15:54:31 +00:00
Wei Fu
51c99dd3fd etcdserver: drain leaky goroutines before test completed
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-02-06 12:58:35 +08:00
Benjamin Wang
573ff18208 Merge pull request #17369 from dusk125/3.4-backport-retry-config
[3.4] add backoff to client config
2024-02-05 17:08:17 +00:00
Benjamin Wang
6301cf3a42 Merge pull request #17368 from dusk125/3.4-to-go1.21
[3.4] Update to go1.21
2024-02-05 16:18:00 +00:00
Allen Ray
8e62f4af61 [3.4] backport: add backoff to client config
Signed-off-by: Allen Ray <alray@redhat.com>
2024-02-05 10:29:34 -05:00
Allen Ray
9591c294b7 [3.4] Update to go1.21
Signed-off-by: Allen Ray <alray@redhat.com>
2024-02-05 10:21:19 -05:00
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