[release-4.22] OCPBUGS-83540: order corosync after OVS configuration on TNF clusters] by openshift-cherrypick-robot · Pull Request #5852 · openshift/machine-config-operator

openshift-cherrypick-robot · 2026-04-15T17:31:53Z

This is an automated cherry-pick of #5834

/assign eggfoobar

On fencing-induced reboots, configure-ovs.sh creates br-ex and migrates the corosync NIC (enp2s0) to an OVS port, stripping the corosync address. knet detects link-down within 84ms, the 3000ms TOTEM token timeout fires, and the surviving node fences the rebooted node again — creating a reboot loop (up to 8 cycles observed in CI). Add a systemd drop-in for corosync.service on TNF clusters that orders it after ovs-configuration.service. Both Wants= and After= are required: After= alone is insufficient because ovs-configuration is in a different activation chain (kubelet-dependencies.target vs multi-user.target), so systemd ignores the ordering unless Wants= pulls ovs-configuration into corosync's start transaction. Verified on a live two-node cluster: with the drop-in, corosync starts only after ovs-configuration completes. No knet link-down, no TOTEM timeout, no fencing loop.

The Wants= directive in the corosync drop-in pulls ovs-configuration into corosync's start transaction. On initial install, corosync starts ~22 minutes after ovs-configuration (after CEO handover), creating a new systemd transaction that re-triggers the oneshot service. The second run of configure-ovs.sh clears ovn-remote (line 13, unconditional), breaking OVN pod networking during installation. Add a ConditionPathExists guard on ovs-configuration.service for TNF clusters. configure-ovs.sh already creates /var/run/ovs-config-executed (line 22) on every successful run. Since /var/run is tmpfs, the marker resets on reboot, allowing normal execution on fencing-induced reboots while preventing re-execution within the same boot. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The drop-in YAML used the same filename (ovs-configuration.service.yaml) as the base unit in templates/common/_base/units/. MCO's template renderer keys by filename with last-write-wins semantics (render.go:223), so the TNF drop-in-only file replaced the base unit entirely — losing ExecStart, Type=oneshot, and all ordering directives. This prevented configure-ovs.sh from running at all, causing bootstrap failures on TNF clusters. Rename to ovs-configuration-skip-rerun.service.yaml to avoid the collision. The YAML's internal name field ("ovs-configuration.service") still correctly targets the unit for the drop-in. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

openshift-merge-bot · 2026-04-15T17:31:57Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

coderabbitai · 2026-04-15T17:32:01Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 6823fe1b-bc71-4b55-aca3-d18db027f025

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

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

eggfoobar · 2026-04-16T05:02:19Z

/lgtm

openshift-merge-bot · 2026-04-16T05:02:32Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-upgrade
/test e2e-gcp-op-part1
/test e2e-gcp-op-part2
/test e2e-gcp-op-single-node
/test e2e-hypershift

fonta-rh · 2026-04-16T08:03:17Z

/approve

fonta-rh · 2026-04-16T08:03:53Z

/jira refresh

openshift-ci-robot · 2026-04-16T08:04:01Z

@fonta-rh: This pull request references Jira Issue OCPBUGS-81572, which is invalid:

expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "5.0" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead
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-81572 to depend on a bug targeting a version in 4.23.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, 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:

/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.

pablintino · 2026-04-16T08:09:25Z

/label backport-risk-assessed
/lgtm

fonta-rh · 2026-04-16T08:10:09Z

/retitle [[release-4.22] OCPBUGS-83540: order corosync after OVS configuration on TNF clusters]

openshift-ci-robot · 2026-04-16T08:10:25Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-83540, which is invalid:

expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "5.0" instead
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 dependent Jira Issue OCPBUGS-81572 to target a version in 4.23.0, but it targets "5.0" 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:

This is an automated cherry-pick of #5834

/assign eggfoobar

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.

fonta-rh · 2026-04-16T08:11:46Z

/jira refresh

openshift-ci-robot · 2026-04-16T08:11:51Z

@fonta-rh: This pull request references Jira Issue OCPBUGS-83540, which is invalid:

expected Jira Issue OCPBUGS-83540 to depend on a bug targeting a version in 4.23.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, 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.

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-04-16T08:11:59Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eggfoobar, fonta-rh, openshift-cherrypick-robot, pablintino

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~~ [pablintino]

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

fonta-rh · 2026-04-16T08:13:44Z

/verified by @fonta-rh in original PR

openshift-ci-robot · 2026-04-16T08:13:56Z

@fonta-rh: This PR has been marked as verified by @fonta-rh in original PR.

Details

In response to this:

/verified by @fonta-rh in original PR

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.

fonta-rh · 2026-04-16T08:16:05Z

/jira refresh

openshift-ci-robot · 2026-04-16T08:16:10Z

@fonta-rh: This pull request references Jira Issue OCPBUGS-83540, which is invalid:

expected dependent Jira Issue OCPBUGS-81572 to target a version in 4.23.0, but it targets "4.23" 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.

fonta-rh · 2026-04-16T08:17:10Z

/jira refresh

openshift-ci-robot · 2026-04-16T08:17:17Z

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

7 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 New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-81572 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-81572 targets the "4.23.0" version, which is one of the valid target versions: 4.23.0
bug has dependents

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.

fonta-rh · 2026-04-16T08:17:52Z

/retitle [release-4.22] OCPBUGS-83540: order corosync after OVS configuration on TNF clusters]

openshift-ci · 2026-04-16T08:40:14Z

@openshift-cherrypick-robot: 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/e2e-gcp-op-ocl-part1	`85109dd`	link	false	`/test e2e-gcp-op-ocl-part1`

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-ci-robot · 2026-04-16T08:44:00Z

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-83540
✔️ 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-83540 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:

This is an automated cherry-pick of #5834

/assign eggfoobar

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-merge-robot · 2026-04-17T01:36:18Z

Fix included in release 4.22.0-0.nightly-2026-04-16-185359

fonta-rh and others added 3 commits April 15, 2026 17:31

openshift-cherrypick-robot assigned eggfoobar Apr 15, 2026

openshift-cherrypick-robot mentioned this pull request Apr 15, 2026

OCPBUGS-81572: order corosync after OVS configuration on TNF clusters #5834

Merged

6 tasks

openshift-ci bot requested review from eggfoobar and suleymanakbas91 April 15, 2026 17:32

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

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 Apr 16, 2026

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

openshift-ci bot assigned anuragthehatter, imatza-rh, mhanss, ptalgulk01, rbbratta and sergiordlr Apr 16, 2026

openshift-ci bot changed the title ~~[release-4.22] OCPBUGS-81572: order corosync after OVS configuration on TNF clusters~~ [[release-4.22] OCPBUGS-83540: order corosync after OVS configuration on TNF clusters](https://github.com/openshift/machine-config-operator/pull/5852#top) Apr 16, 2026

openshift-ci bot assigned pablintino Apr 16, 2026

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

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 16, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 16, 2026

openshift-ci bot changed the title ~~[[release-4.22] OCPBUGS-83540: order corosync after OVS configuration on TNF clusters](https://github.com/openshift/machine-config-operator/pull/5852#top)~~ [release-4.22] OCPBUGS-83540: order corosync after OVS configuration on TNF clusters] Apr 16, 2026

openshift-merge-bot bot merged commit efd28f7 into openshift:release-4.22 Apr 16, 2026
18 of 19 checks passed

Conversation

openshift-cherrypick-robot commented Apr 15, 2026

Uh oh!

openshift-merge-bot bot commented Apr 15, 2026

Uh oh!

coderabbitai bot commented Apr 15, 2026

Review skipped

Uh oh!

eggfoobar commented Apr 16, 2026

Uh oh!

openshift-merge-bot bot commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026

Uh oh!

openshift-ci-robot commented Apr 16, 2026

Uh oh!

pablintino commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026

Uh oh!

openshift-ci-robot commented Apr 16, 2026

Uh oh!

openshift-ci bot commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026

Uh oh!

openshift-ci-robot commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026

Uh oh!

openshift-ci-robot commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026

Uh oh!

openshift-ci-robot commented Apr 16, 2026

Uh oh!

fonta-rh commented Apr 16, 2026

Uh oh!

openshift-ci bot commented Apr 16, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 16, 2026

Uh oh!

openshift-merge-robot commented Apr 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

fonta-rh commented Apr 16, 2026 •

edited

Loading