16185 Commits

Author SHA1 Message Date
Benjamin Wang
1d02c16e2a
Merge pull request #17864 from fuweid/backport-17815-34
[3.4] fix revision loss issue caused by compaction - 17780
2024-04-25 14:26:14 +01:00
Wei Fu
4cb197e0fa mvcc: should update currentRev in revMu
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 11:16:19 +08:00
Wei Fu
41eb03a55e mvcc: update currentRev if scheduledCompact > currentRev
Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 9ea234913a99670d18b66aa23915781f89713177)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 11:16:13 +08:00
Wei Fu
a9727e6016 tests/e2e: reproduce #17780
Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 71733911544f8fce6d06d2a8e9cca0944b3659be)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 11:02:25 +08:00
Wei Fu
844c4b02f7 tests/e2e: support CompactionBatchLimit flag
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 11:02:01 +08:00
Wei Fu
dcda47dc29 mvcc: introduce compactBeforeSetFinishedCompact failpoint
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 10:30:36 +08:00
Benjamin Wang
48b0c496c0
Merge pull request #17821 from siyuanfoundation/3.4-downgrade
[3.4] Allow updateClusterVersion when downgrading from 3.5.
2024-04-23 09:55:14 +01:00
Benjamin Wang
913a0805f9
Merge pull request #17831 from ahrtr/3.4_update_compact_log_bootstrap_20240421
[3.4] Update the compaction log when bootstrap and update compact's signature
2024-04-23 09:50:52 +01:00
Siyuan Zhang
0d62c99777 Allow updateClusterVersion when downgrading from 3.5.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-04-22 22:39:03 +00:00
Benjamin Wang
f8f186490b Update the compaction log when bootstrap and update compact's signature
Actually the compact() never return an error, so remove the second return
parameter.

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
2024-04-21 13:24:10 +01:00
Benjamin Wang
6093ab9033
Merge pull request #17814 from henrybear327/backport-3.4/ignore-raft-messages-if-member-id-mismatch
[backport-3.4] server: ignore raft messages if member id mismatch
2024-04-18 13:27:35 +01:00
Chun-Hung Tseng
1b53a26cae
[backport-3.4] server: ignore raft messages if member id mismatch #17078
Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-04-17 13:50:15 +02:00
James Blair
d7205ca5e3
Merge pull request #17715 from ArkaSaha30/trivy-scan-head-3.4
[3.4]Add trivy scan for current branch HEAD
2024-04-06 21:48:16 +02:00
Benjamin Wang
87113dd4ab
Merge pull request #17714 from henrybear327/backport-3.4/add-initialization-for-epMu-in-contetx-client
Backport initialization of epMu in NewCtxClient to release-3.4
2024-04-05 10:29:01 +01:00
Benjamin Wang
bb903a36ae
Merge pull request #17705 from fuweid/34-cp-17462
[3.4] *: LeaseTimeToLive returns error if leader changed
2024-04-05 09:01:00 +01:00
ArkaSaha30
af4a4ffe1d
[3.4]Add trivy scan as a job in release workflow
Signed-off-by: ArkaSaha30 <arkasaha30@gmail.com>
2024-04-05 00:45:47 +05:30
Chun-Hung Tseng
8efb620c96
Backport initialization of epMu in NewCtxClient to release-3.4
References:
- etcd-io#17001
- etcd-io#17018

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-04-04 20:55:32 +02:00
Wei Fu
acc5325889 *: LeaseTimeToLive returns error if leader changed
The old leader demotes lessor and all the leases' expire time will be
updated. Instead of returning incorrect remaining TTL, we should return
errors to force client retry.

Cherry-pick: d3bb6f688b4643155b4a9924cec726bdc76a1306

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-04 22:32:23 +08:00
Wei Fu
609be39ea9 .github: enable failpoints for integration tests
And introduce helper to toggle failpoints by makefile.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-04 22:32:23 +08:00
Benjamin Wang
ef2805fb50
Merge pull request #17709 from henrybear327/cve/3.4-bump-go-1.21.9
Bump go-version to 1.21.9 for release-3.4 due to CVE-2023-45288
2024-04-04 15:02:36 +01:00
Chun-Hung Tseng
62a7a359e6
Bump golang.org/x/net to v0.23.0
Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-04-04 10:55:07 +02:00
Chun-Hung Tseng
5acca2781e
Bump go-version to 1.21.9 for release-3.4 due to CVE-2023-45288
Reference:
- PR #17703

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-04-04 10:55:07 +02:00
Benjamin Wang
7090967a79
Merge pull request #17692 from sheyt0/12985-to-34
[3.4] backport for fix retry requests when receiving ErrGPRCNotSupportedForLearner
2024-04-04 08:32:53 +01:00
Piotr Tabor
5f6f21e8cd Fix retry requests when receiving ErrGPRCNotSupportedForLearner
Signed-off-by: Ilya Baev <ilya.baev@gcore.com>
2024-04-02 06:29:33 +00:00
James Blair
f7cb2f4578
Merge pull request #17688 from etcd-io/dependabot/docker/release-3.4/distroless/static-debian11-046b92c933032a8ca99a66f4c79a68ac029d9a4ababd1a806a82140b3b899fd3
build(deps): bump distroless/static-debian11 from `7e5c6a2` to `046b92c`
2024-04-01 21:21:38 +02:00
dependabot[bot]
2cde56761d
build(deps): bump distroless/static-debian11 from 7e5c6a2 to 046b92c
Bumps distroless/static-debian11 from `7e5c6a2` to `046b92c`.

---
updated-dependencies:
- dependency-name: distroless/static-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-01 17:38:44 +00:00
Benjamin Wang
75f799cdc1
Merge pull request #17665 from siyuanfoundation/3.4-downgrade
[3.4] Allow new server to join higher cluster version if NextClusterVersionCompatible is true
2024-03-29 21:04:28 +00:00
Siyuan Zhang
723ef9f1e4 Allow server to join higher cluster version if NextClusterVersionCompatible is true
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-03-28 23:29:17 +00:00
Benjamin Wang
51f9d44f86
Merge pull request #17626 from etcd-io/dependabot/docker/release-3.4/distroless/static-debian11-7e5c6a2a4ae854242874d36171b31d26e0539c98fc6080f942f16b03e82851ab
build(deps): bump distroless/static-debian11 from `9be3fcc` to `7e5c6a2`
2024-03-21 13:16:26 +01:00
dependabot[bot]
5e773aa8b4
build(deps): bump distroless/static-debian11 from 9be3fcc to 7e5c6a2
Bumps distroless/static-debian11 from `9be3fcc` to `7e5c6a2`.

---
updated-dependencies:
- dependency-name: distroless/static-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-21 07:28:26 +00:00
Benjamin Wang
950cd5fbe6 bump version to 3.4.31
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
v3.4.31
2024-03-20 14:50:13 +01:00
Benjamin Wang
e878a11a23
Merge pull request #17610 from chaochn47/backport-3.4-fix-watch-event-loss-after-compaction
[release-3.4] backport fix watch event loss after compaction #17555
2024-03-19 22:01:07 +01:00
Chao Chen
e2b29c4cf4 backport fix watch event loss after compaction #17555
Signed-off-by: Chao Chen <chaochn@amazon.com>
2024-03-18 17:38:56 -07:00
Benjamin Wang
f38dfe23d1
Merge pull request #17580 from vivekpatani/release-3.4
[3.4] dependency: bump github.com/sirupsen/logrus to v1.9.3
2024-03-12 18:11:23 +00:00
vivekpatani
150cf3af80 dependency: bump github.com/sirupsen/logrus to v1.9.3
Signed-off-by: vivekpatani <9080894+vivekpatani@users.noreply.github.com>
2024-03-12 10:02:20 -07:00
Marek Siarkowicz
a3488d7943
Merge pull request #17567 from serathius/progressrequest-new-watch-3.4
[release-3.4] Fix progress notification for watch that doesn't get any events
2024-03-12 12:01:01 +01:00
Marek Siarkowicz
9399dd1628 Fix progress notification for watch that doesn't get any events
When implementing the fix for progress notifications
(https://github.com/etcd-io/etcd/pull/15237) we made a incorrect
assumption that that unsynched watches will always get at least one event.

Unsynched watches include not only slow watchers, but also newly created
watches that requested current or older revision. In case that non of the events
match watch filter, those newly created watches might become synched
without any event going through.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2024-03-11 20:20:15 +01:00
Benjamin Wang
358e3bae75
Merge pull request #17552 from ivanvc/release-3.4-add-govuln-github-workflow
[3.4] Add govuln GitHub workflow
2024-03-08 17:01:07 +00:00
Ivan Valdes
5c0895cc04
Add govuln GitHub workflow
Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-03-08 08:29:23 -08:00
Benjamin Wang
49a7ab1937
Merge pull request #17554 from ivanvc/release-3.4-bump-google-protobuf-to-1.33.0
[3.4] dependency: bump google protobuf to 1.33.0
2024-03-08 15:57:57 +00:00
Ivan Valdes
6ef46662ad
dependency: bump google.golang.org/protobuf from v1.31.0 to v1.33.0
Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-03-07 16:09:37 -08:00
Benjamin Wang
38db466174
Merge pull request #17541 from liangyuanpeng/update_go
[3.4] Update go version to 1.21.8 for build.
2024-03-06 13:53:07 +00:00
Lan Liang
5150b4d5a1 Update go version to 1.21.8 for build.
Signed-off-by: Lan Liang <gcslyp@gmail.com>
2024-03-06 13:31:26 +00:00
Benjamin Wang
7bbc9a530b
Merge pull request #17538 from liangyuanpeng/3.4_go_1.21.8
[3.4] Update go version to 1.21.8
2024-03-06 10:38:07 +00:00
Lan Liang
34d40a6fc1 Update go version to 1.21.8
Signed-off-by: Lan Liang <gcslyp@gmail.com>
2024-03-06 09:34:29 +00:00
Benjamin Wang
82b8c6615f
Merge pull request #17484 from ahrtr/3.4_bump_bbolt_1.3.9
[3.4] Bump bbolt to v1.3.9
2024-02-26 11:16:27 +00:00
Benjamin Wang
700e5765d7 Bump bbolt to 1.3.9 for 3.4
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
2024-02-24 15:42:59 +00:00
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 f7e488dc9262685d6624755e0d3bb0a655863248,
67f17166bf2ba337dafb8e0ea8eea5f74a990767,
and f7ff898fd6c2d6dbb54278343073aa4fa5f46a03.

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 65add8cec44b32682e59d2596a592038bac90dcd.

Co-authored-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-02-20 11:31:29 -08:00