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

16206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Blair
9873813674
Merge pull request #18248 from thedtripp/feature/installShellcheckBackport3.4 
[3.4] Install shellcheck if it is not present
 2024-06-30 05:08:33 +12:00
D Tripp
e3c0ac0bec etcd 3.4: Install shellcheck if not installed. 
Include conditional logic to install shellcheck with correct architecture.

This is based on commit 4f23883 and pull request etcd-io#14872.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
 2024-06-28 23:34:25 +00:00
D Tripp
f599316654 etcd 3.4: fix shellcheck violations [SC2086] by adding double quotes to variables where needed. 
Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
 2024-06-28 23:32:36 +00:00
Wenjia Zhang
5cd1d285d7 Bump the version to 3.4.33 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
v3.4.33 		2024-06-13 14:10:46 +00:00
Benjamin Wang
88ff600ed9
Merge pull request #18139 from ahrtr/3.4_apply_log_20240606 
[3.4] print error log when validation on conf change failed
 2024-06-07 09:53:21 +01:00
Benjamin Wang
f0276cb4fa print error log when validation on conf change failed 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
 2024-06-06 19:34:44 +01:00
Benjamin Wang
041cd4eb31
Merge pull request #18130 from ArkaSaha30/release-3.4-cve-2024-24790 
[3.4]Bump Go version to 1.21.11: CVE 2024-24790 fix
 2024-06-05 10:37:46 +01:00
ArkaSaha30
74533d94b2
Bump Go version to 1.21.11: CVE 2024-24790 fix 
Signed-off-by: ArkaSaha30 <arkasaha30@gmail.com>
 2024-06-05 13:56:43 +05:30
Marek Siarkowicz
88c2295768
Merge pull request #18106 from ivanvc/release-3.4-scripts-release-shallow-git-clone 
[3.4] scripts/release: shallow clone repository
 2024-06-01 07:21:23 +02:00
Ivan Valdes
0e17a3310e
scripts/release: shallow clone repository 
Backport of commit 4881e53677f6cb592aa1cf7ee15bfd51e6cf1ff9 / pull
request #18095.

Signed-off-by: Ivan Valdes <ivan@vald.es>
 2024-05-31 15:39:51 -07:00
James Blair
d37a470645
Merge pull request #18016 from MadhavJivrajani/go-version-setup 
[release-3.4]  Setup a way to consistently manage go versions across scripts and go.mods
 2024-05-16 20:58:56 +12:00
Madhav Jivrajani
90666624f3 .*: sync go toolchain version and add ability to verify versions 
This commit adds a script to sync the version present in .go-version
across all go.mod files as the toolchain directive. As part of that,
this commit also modifies go.mod files that did not have synced toolchain
directives.

Additionally, this also adds a script to verify all toolchain and go
directives against the version present in .go-version as follows:
(1) The go directive <= version in .go-version
(2) The toolchain directive == version in .go-version

This script runs as part of the `make verify` target, making it run
as a presbumit by default.

Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com>
 2024-05-15 15:35:21 +05:30
Benjamin Wang
70cc6cce7e
Merge pull request #17981 from lavishpal/update/golang-to-1.21.10 
[3.4] dependency: update golang to 1.21.10
 2024-05-10 20:04:10 +01:00
Lavish pal
6566399fa9 update golang to 1.21.10 
Signed-off-by: Lavish pal <lvishpal408@gmail.com>
 2024-05-10 18:46:43 +05:30
Benjamin Wang
ce4e46202a
Merge pull request #17945 from tjungblu/bboltbump3.4_1.3.10 
Bump bbolt to 1.3.10 for 3.4
 2024-05-06 11:53:36 +01:00
Thomas Jungblut
1f138ae558 Bump bbolt to 1.3.10 for 3.4 
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
 2024-05-06 11:34:57 +02:00
James Blair
6f05ab9e99
Merge pull request #17919 from etcd-io/dependabot/docker/release-3.4/distroless/static-debian11-6d31326376a7834b106f281b04f67b5d015c31732f594930f2ea81365f99d60c 
build(deps): bump distroless/static-debian11 from `046b92c` to `6d31326`
 2024-05-03 05:35:25 +12:00
dependabot[bot]
61acd0f257
build(deps): bump distroless/static-debian11 from 046b92c to 6d31326 
Bumps distroless/static-debian11 from `046b92c` to `6d31326`.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-01 17:23:54 +00:00
Benjamin Wang
4ac6554c44
Merge pull request #17896 from ivanvc/release-3.4-fix-grpc-proxy-member-list-not-updated-with-node-deletion 
[3.4] fix grpc proxy member list not updated with node deletion
 2024-04-30 19:55:07 +01:00
Ivan Valdes
f65ff88511
grpcproxy: fix memberlist results not update when proxy node down 
If grpc starts with `--resolver-prefix`, its memberlist will return all
alive proxy nodes. When one GRPC proxy node goes down it shouldn't
return that node, however, it's returned.

Backport of PR #15907 / commit ecfed91e5050431385961573e5c09658a66a59d5.

Co-authored-by: yellowzf <zzhf3311@163.com>
Signed-off-by: Ivan Valdes <ivan@vald.es>
 2024-04-29 10:22:00 -07:00
Sahdev Zala
9ac4e7ef06 bump version to 3.4.32 
Signed-off-by: Sahdev Zala <spzala@us.ibm.com>
v3.4.32 		2024-04-25 17:47:34 +00:00
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