Skip to content

Revert "OCPBUGS-77947: fix(tnf): do not block on stable revision after external etcd transition"#1572

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
jaypoulz:revert-1562-tnf-no-block-stable-revision-post-transition
Mar 19, 2026
Merged

Revert "OCPBUGS-77947: fix(tnf): do not block on stable revision after external etcd transition"#1572
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
jaypoulz:revert-1562-tnf-no-block-stable-revision-post-transition

Conversation

@jaypoulz
Copy link
Copy Markdown
Contributor

Reverts #1562

This PR intended to speed up recovery post-node replacement. After analysis, it does accomplish that goal, with an approximate gain of 1-2 minutes while the node comes up. The cost of this; however, is that we've introduced a race condition where the node installer needs to run at least once on the replaced node before TNF's podman-etcd can start the etcd container. If it hasn't run, podman-etcd fails because the certs directory is missing. While it is unlikely that wouldn't eventually resolve (since podman-etcd will retry etcd multiple times) it's just safer to handle this in CEO. Furthermore, the concern about this blocking TNF updates indefinitely was unfounded. That aspect (seen the in the node recovery job and fixed by openshift/origin#30846, was actually broken by #1554.

@openshift-ci-robot 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 Mar 13, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jaypoulz: This pull request references Jira Issue OCPBUGS-77947, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified 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.

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

Details

In response to this:

Reverts #1562

This PR intended to speed up recovery post-node replacement. After analysis, it does accomplish that goal, with an approximate gain of 1-2 minutes while the node comes up. The cost of this; however, is that we've introduced a race condition where the node installer needs to run at least once on the replaced node before TNF's podman-etcd can start the etcd container. If it hasn't run, podman-etcd fails because the certs directory is missing. While it is unlikely that wouldn't eventually resolve (since podman-etcd will retry etcd multiple times) it's just safer to handle this in CEO. Furthermore, the concern about this blocking TNF updates indefinitely was unfounded. That aspect (seen the in the node recovery job and fixed by openshift/origin#30846, was actually broken by #1554.

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 13, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 19ecb47b-5746-4ae4-a08d-b8826b0bc578

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from clobrano and fonta-rh March 13, 2026 20:07
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 13, 2026
@jaypoulz
Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Mar 13, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jaypoulz: This pull request references Jira Issue OCPBUGS-77947, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (dhensel@redhat.com), skipping review request.

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-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Mar 13, 2026
@eggfoobar
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eggfoobar, jaypoulz

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:

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

@eggfoobar
Copy link
Copy Markdown
Contributor

/verified bypass

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 16, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@eggfoobar: The verified label has been added.

Details

In response to this:

/verified bypass

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.

@jaypoulz
Copy link
Copy Markdown
Contributor Author

/retest required

@jaypoulz
Copy link
Copy Markdown
Contributor Author

/retest-required

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 19, 2026

@jaypoulz: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 2acdf90 into openshift:main Mar 19, 2026
15 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@jaypoulz: Jira Issue Verification Checks: Jira Issue OCPBUGS-77947
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-77947 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Reverts #1562

This PR intended to speed up recovery post-node replacement. After analysis, it does accomplish that goal, with an approximate gain of 1-2 minutes while the node comes up. The cost of this; however, is that we've introduced a race condition where the node installer needs to run at least once on the replaced node before TNF's podman-etcd can start the etcd container. If it hasn't run, podman-etcd fails because the certs directory is missing. While it is unlikely that wouldn't eventually resolve (since podman-etcd will retry etcd multiple times) it's just safer to handle this in CEO. Furthermore, the concern about this blocking TNF updates indefinitely was unfounded. That aspect (seen the in the node recovery job and fixed by openshift/origin#30846, was actually broken by #1554.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants