OCPBUGS-74602: 4.19 rebase 3.5.26 by jubittajohn · Pull Request #360 · openshift/etcd

jubittajohn · 2026-02-06T16:04:08Z

Bump etcd from 3.5.24 to 3.5.26 in 4.19

It's to support dedicated WAL dir mode. REF: etcd-io#20870 Signed-off-by: Wei Fu <fuweid89@gmail.com>

…cated-dir [release-3.5] etcdutl: add --wal-dir for check-v2store

…move learners issue Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

[release-3.5] Fix the issue that --force-new-cluster can't clean up learner after creating v2 snapshot

Signed-off-by: ronaldngounou <ronald.ngounou@yahoo.com>

…12410 [release 3.5] Bump from go1.24.9 to go1.24.10

Signed-off-by: Ivan Valdes <iv@a.ki>

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

[release-3.5] Print token fingerprint instead of the original tokens in log messages

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

[release-3.5] Fix a typo of 'etcdctl snapshot restore' command

Signed-off-by: hwdef <hwdefcom@outlook.com>

[release-3.5] Bump go to 1.24.11

Signed-off-by: Wei Fu <fuweid89@gmail.com>

There are three places where zombie membership information can be cleaned up: 1. ApplierV2 -> UpdateAttributes Ideally, each member updates its own attributes only once before serving requests. Since this happens only at startup and at low frequency, it is safe to clean up zombie members during this operation. Additionally, pending logs are always applied before attributes are updated, so there is no data race. 2. Applying a snapshot via Raft message When a member receives a snapshot through a Raft message, the v2store is synchronized with the v3store. This makes it safe to detect and clean up zombie membership entries at that time. 3. Applying ConfChange Check and cleanup zombie members after ConfChange. Ideally, there aren't too many ConfChange, the impact on performance should be minimal. Signed-off-by: Wei Fu <fuweid89@gmail.com>

[release-3.5] server: cleanup zombie membership information

Addresses CVE-2025-47914, CVE-2025-58181. Signed-off-by: Ivan Valdes <ivan@vald.es>

[release-3.5] dependency: Bump golang.org/x/crypto from 0.38.0 to 0.45.0

Signed-off-by: joshjms <joshjms1607@gmail.com>

….38.0 to 0.45.0" This reverts commit 751f162.

openshift-ci-robot · 2026-02-06T16:04:15Z

@jubittajohn: This pull request references Jira Issue OCPBUGS-74602, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-74602 to depend on a bug targeting a version in 4.20.0, 4.20.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Bump etcd from 3.5.24 to 3.5.26 in 4.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

dusk125 · 2026-02-06T19:11:57Z

/lgtm
/label backport-risk-assessed

openshift-ci · 2026-02-06T19:12:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, jubittajohn

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [dusk125]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

dusk125 · 2026-02-06T19:23:02Z

/override ci/prow/okd-scos-images
Unrelated, permafailing

openshift-ci · 2026-02-06T19:23:20Z

@dusk125: Overrode contexts on behalf of dusk125: ci/prow/okd-scos-images

Details

In response to this:

/override ci/prow/okd-scos-images
Unrelated, permafailing

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

dusk125 · 2026-02-06T19:35:27Z

/jira refresh

openshift-ci-robot · 2026-02-06T19:35:31Z

@dusk125: This pull request references Jira Issue OCPBUGS-74602, which is invalid:

expected dependent Jira Issue OCPBUGS-70151 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2026-02-06T19:46:19Z

@jubittajohn: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/okd-scos-images	`da481c1`	link	true	`/test okd-scos-images`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

fuweid and others added 23 commits November 4, 2025 09:30

etcdutl: add --wal-dir for check-v2store

67ddeb5

It's to support dedicated WAL dir mode. REF: etcd-io#20870 Signed-off-by: Wei Fu <fuweid89@gmail.com>

Merge pull request etcd-io#20886 from fuweid/add-new-flag-to-set-dedi…

e01a247

…cated-dir [release-3.5] etcdutl: add --wal-dir for check-v2store

Add an e2e test cases to reproduce the '--force-new-cluster' can't re…

2cdacbc

…move learners issue Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

Fix the '--force-new-cluster' can't clean up learners issue

547d6f4

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

Merge pull request etcd-io#20897 from ahrtr/20251106_learner_3.5

449abd9

[release-3.5] Fix the issue that --force-new-cluster can't clean up learner after creating v2 snapshot

Bump from go1.24.9 to go1.24.10

26c6751

Signed-off-by: ronaldngounou <ronald.ngounou@yahoo.com>

Merge pull request etcd-io#20902 from ronaldngounou/release35-bump-go…

d0b3177

…12410 [release 3.5] Bump from go1.24.9 to go1.24.10

version: bump up to 3.5.25

e2eff77

Signed-off-by: Ivan Valdes <iv@a.ki>

Print token fingerprint instead of the original tokens in log messages

8bdb0ed

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

Merge pull request etcd-io#20942 from ahrtr/20251117_tokens_3.5

8cb87d1

[release-3.5] Print token fingerprint instead of the original tokens in log messages

Fix a typo of 'etcdctl snapshot restore/status' commands

80e15b8

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>

Merge pull request etcd-io#20948 from ahrtr/20251118_typo_3.5

2fdfaf7

[release-3.5] Fix a typo of 'etcdctl snapshot restore' command

Bump go to 1.24.11

a8ffc2e

Signed-off-by: hwdef <hwdefcom@outlook.com>

Merge pull request etcd-io#20999 from hwdef/release35-bump-go-12411

0fbd828

[release-3.5] Bump go to 1.24.11

tests: setup two testcases to reproduce 20967 issue

5ff8421

Signed-off-by: Wei Fu <fuweid89@gmail.com>

Merge pull request etcd-io#20995 from fuweid/reproduce-20967

83553fc

[release-3.5] server: cleanup zombie membership information

dependency: Bump golang.org/x/crypto from 0.38.0 to 0.45.0

751f162

Addresses CVE-2025-47914, CVE-2025-58181. Signed-off-by: Ivan Valdes <ivan@vald.es>

Merge pull request etcd-io#21023 from ivanvc/release-3.5-x-crypto-0.45.0

abf4be9

[release-3.5] dependency: Bump golang.org/x/crypto from 0.38.0 to 0.45.0

version: bump up to 3.5.26

65251b3

Signed-off-by: joshjms <joshjms1607@gmail.com>

Merge branch 'openshift-4.19' into HEAD

d716883

UPSTREAM: <drop>: manually resolve conflicts

847c046

UPSTREAM: <drop>: Revert "dependency: Bump golang.org/x/crypto from 0…

da481c1

….38.0 to 0.45.0" This reverts commit 751f162.

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 6, 2026

openshift-ci bot requested review from dusk125 and hexfusion February 6, 2026 16:04

jubittajohn mentioned this pull request Feb 6, 2026

OCPBUGS-74602: 4.19 rebase 3.5.26 #359

Closed

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 6, 2026

openshift-ci bot assigned dusk125 Feb 6, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2026

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 6, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-74602: 4.19 rebase 3.5.26#360

OCPBUGS-74602: 4.19 rebase 3.5.26#360
jubittajohn wants to merge 23 commits intoopenshift:openshift-4.19from
jubittajohn:openshift-4.19-rebase-3.5.26

jubittajohn commented Feb 6, 2026

Uh oh!

openshift-ci-robot commented Feb 6, 2026

Uh oh!

dusk125 commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

dusk125 commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

dusk125 commented Feb 6, 2026

Uh oh!

openshift-ci-robot commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Conversation

jubittajohn commented Feb 6, 2026

Uh oh!

openshift-ci-robot commented Feb 6, 2026

Uh oh!

dusk125 commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

dusk125 commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

dusk125 commented Feb 6, 2026

Uh oh!

openshift-ci-robot commented Feb 6, 2026

Uh oh!

openshift-ci bot commented Feb 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants