Skip to content

[release-4.16] OCPBUGS-64858: Fix stale EIP assignments during failover and controller restart #2851

Merged
openshift-merge-bot[bot] merged 4 commits intoopenshift:release-4.16from
pperiyasamy:eip_failover_ovnkubenode_restart_4.16
Nov 16, 2025
Merged

[release-4.16] OCPBUGS-64858: Fix stale EIP assignments during failover and controller restart #2851
openshift-merge-bot[bot] merged 4 commits intoopenshift:release-4.16from
pperiyasamy:eip_failover_ovnkubenode_restart_4.16

Conversation

@pperiyasamy
Copy link
Member

@pperiyasamy pperiyasamy commented Nov 10, 2025

Manual cherry-pick of 4.17 PR #2850.

Resolved merge conflicts in go-controller/pkg/ovn/default_network_controller.go (commit 0dd5bb4), specifically within the SyncFunc switch case block.

The UTs in commits 1a813fa, 55c4ecc and f5ffbe1 needed update for AddressSets match.

@openshift-ci openshift-ci bot requested review from kyrtapz and tssurya November 10, 2025 14:11
@pperiyasamy pperiyasamy changed the title [release-4.16] Fix stale EIP assignments during failover and controller restart [release-4.16] OCPBUGS-64858: Fix stale EIP assignments during failover and controller restart Nov 10, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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 Nov 10, 2025
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: This pull request references Jira Issue OCPBUGS-64858, which is invalid:

  • expected dependent Jira Issue OCPBUGS-64856 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New 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:

Manual cherry-pick of 4.17 PR commits 09ed6cc, ea2a43f, bbaf02c and 4224af7.
The commit dce4af6 was needed only in 4.17, so not required for 4.16. No conflicts happened for other commits,
The UTs in commits 5033d71, d6d833f, 9eecc76 needed update for AddressSets match.

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.

@huiran0826
Copy link
Contributor

/verified by @huiran0826

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 12, 2025
@openshift-ci-robot
Copy link
Contributor

@huiran0826: This PR has been marked as verified by @huiran0826.

Details

In response to this:

/verified by @huiran0826

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.

martinkennelly and others added 4 commits November 12, 2025 14:13
Signed-off-by: Martin Kennelly <mkennell@redhat.com>
(cherry picked from commit 2735d6b)
(cherry picked from commit 562c749)
(cherry picked from commit 8049fdf)
(cherry picked from commit 7b12cc6)
(cherry picked from commit cc4bba0)
Scenario:
- Nodes: node-1, node-2, node-3
- Egress IPs: EIP-1
- Pods: pod1 on node-1, pod2 on node-3 (pods are created via deployment replicas)
- Egress-assignable nodes: node-1, node-2
- EIP-1 assigned to node-1

During a simultaneous reboot of node-1 and node-2, EIP-1 failed over to node-2 and
ovnkube-controller restarted at nearly the same time:

1) EIP-1 was reassigned to node-2 by the cluster manager.
2) The sync EIP happened for EIP1 with stale status, though it cleaned SNATs/LRPs
   referring to node-1 due to outdated pod IPs (this is because pods will be
   recreated due to node reboots).
3) pod1/pod2 Add events arrived while the informer cache still had the
   old EIP status, so new SNATs/LRPs were created pointing to node-1.
4) The EIP-1 Add event arrived with the new status; entries for node-2
   were added/updated.
5) Result: stale SNATs and LRPs with stale nexthops for node-1 remained.

Fix:
- Populate pod EIP status during EgressIP sync so podAssignment has
  accurate egressStatuses.
- Reconcile stale assignments using podAssignment (egressStatuses) when
  the informer cache is not up to date, ensuring SNAT/LRP for the
  previously assigned node are corrected.
- Remove stale EIP SNAT entries for remote-zone pods accordingly.
- Add coverage for simultaneous EIP failover and controller restart.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit 1667a51)
(cherry picked from commit 7060af6)
(cherry picked from commit 0a3e1b9)
(cherry picked from commit 75f0b7e)
(cherry picked from commit 69afe23)
During an ovnkube-controller restart, pod add/remove events
for EgressIP-served pods may occur before the factory.egressIPPod
handler is registered in the watch factory. As a result, the EIP
controller never able to handle pod delete, leading to stale
logical router policy (LRP) entry.

Scenario:

ovnkube-controller starts.

The EIP controller processes the namespace add event (oc.WatchEgressIPNamespaces)
and creates an LRP entry for the served pod.

The pod is deleted.

The factory.egressIPPod handler registration happens afterward via oc.WatchEgressIPPods.

The pod delete event is never processed by the EIP controller.

Fix:

1. Start oc.WatchEgressIPPods followed by oc.WatchEgressIPNamespaces.
2. Sync EgressIPs before registering factory.egressIPPod event handler.
3. Removal of Sync EgressIPs for factory.EgressIPNamespaceType which is no longer needed.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit 8975b00)
(cherry picked from commit b8303a2)
(cherry picked from commit 3f391e7)
(cherry picked from commit 6cd0f09)
(cherry picked from commit 0dd5bb4)
When the EIP controller cleans up a stale EIP assignment for a pod,
it also removes the pod object from the podAssignment cache.
This is incorrect, as it prevents the EIP controller from processing
the subsequent pod delete event.

Scenario:

1. pod-1 is served by eip-1, both hosted on node1.
2. node1’s ovnkube-controller restarts.
3. Pod add event is received by the EIP controller — no changes.
4. eip-1 moves from node1 to node0.
5. The EIP controller receives the eip-1 add event.
6. eip-1 cleans up pod-1’s stale assignment (SNAT and LRP) for node1,
   but removes the pod object from the podAssignment cache when no other
   assignments found.
7. The EIP controller programs the LRP entry with node0’s transit IP as
   the next hop, but the pod assignment cache is not updated with new
   podAssignmentState.
8. The pod delete event is received by the EIP controller but ignored,
   since the pod object is missing from the assignment cache.

So this commit fixes the issue by adding podAssignmentState back into
podAssignment cache at step 7.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit 16dedd1)
(cherry picked from commit f4e2c17)
(cherry picked from commit be0f3b8)
(cherry picked from commit 3a524b5)
(cherry picked from commit 7d8eb17)
@pperiyasamy pperiyasamy force-pushed the eip_failover_ovnkubenode_restart_4.16 branch from 9eecc76 to f5ffbe1 Compare November 12, 2025 14:12
@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Nov 12, 2025
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: This pull request references Jira Issue OCPBUGS-64858, which is invalid:

  • expected dependent Jira Issue OCPBUGS-64856 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New 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:

Manual cherry-pick of 4.17 PR #2850.

Resolved merge conflicts in go-controller/pkg/ovn/default_network_controller.go (commit 0dd5bb4), specifically within the SyncFunc switch case block.

The UTs in commits 1a813fa, 55c4ecc and f5ffbe1 needed update for AddressSets match.

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.

@huiran0826
Copy link
Contributor

/verified by @huiran0826

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 13, 2025
@openshift-ci-robot
Copy link
Contributor

@huiran0826: This PR has been marked as verified by @huiran0826.

Details

In response to this:

/verified by @huiran0826

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.

@pperiyasamy
Copy link
Member Author

/retest-required

@pperiyasamy
Copy link
Member Author

/payload 4.16 ci blocking
/payload 4.16 nightly blocking

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 13, 2025

@pperiyasamy: trigger 5 job(s) of type blocking for the ci release of OCP 4.16

  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-azure-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1946d6f0-c0b2-11f0-81da-b18980cd49e2-0

trigger 8 job(s) of type blocking for the nightly release of OCP 4.16

  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.16-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.16-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.16-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1946d6f0-c0b2-11f0-81da-b18980cd49e2-1

@pperiyasamy
Copy link
Member Author

/retest-required

@pperiyasamy
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-upgrade
/payload-job periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 14, 2025

@pperiyasamy: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.16-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1cc2b2a0-c133-11f0-9b3e-6cff4bd852a7-0

@pperiyasamy
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 14, 2025

@pperiyasamy: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.16-upgrade-from-stable-4.15-e2e-gcp-ovn-rt-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/493b92e0-c154-11f0-976e-1d7f8aac925f-0

@pperiyasamy
Copy link
Member 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 Nov 14, 2025
@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 Nov 14, 2025
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: This pull request references Jira Issue OCPBUGS-64858, 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.16.z) matches configured target version for branch (4.16.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-64856 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-64856 targets the "4.17.z" version, which is one of the valid target versions: 4.17.0, 4.17.z
  • bug has dependents

Requesting review from QA contact:
/cc @huiran0826

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 openshift-ci bot requested a review from huiran0826 November 14, 2025 12:21
@pperiyasamy
Copy link
Member Author

/assign @jcaamano

@pperiyasamy
Copy link
Member Author

/retest-required

@jcaamano
Copy link
Contributor

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Nov 14, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano, pperiyasamy

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 94a706a and 2 for PR HEAD f5ffbe1 in total

@pperiyasamy
Copy link
Member Author

/retest-required

2 similar comments
@pperiyasamy
Copy link
Member Author

/retest-required

@pperiyasamy
Copy link
Member Author

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 15, 2025

@pperiyasamy: The following tests 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/security f5ffbe1 link false /test security
ci/prow/e2e-aws-ovn-serial f5ffbe1 link true /test e2e-aws-ovn-serial
ci/prow/e2e-aws-ovn-local-to-shared-gateway-mode-migration f5ffbe1 link true /test e2e-aws-ovn-local-to-shared-gateway-mode-migration

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.

@pperiyasamy
Copy link
Member Author

/retest-required

@openshift-merge-bot openshift-merge-bot bot merged commit 8df7e87 into openshift:release-4.16 Nov 16, 2025
24 of 25 checks passed
@openshift-ci-robot
Copy link
Contributor

@pperiyasamy: Jira Issue Verification Checks: Jira Issue OCPBUGS-64858
✔️ 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-64858 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:

Manual cherry-pick of 4.17 PR #2850.

Resolved merge conflicts in go-controller/pkg/ovn/default_network_controller.go (commit 0dd5bb4), specifically within the SyncFunc switch case block.

The UTs in commits 1a813fa, 55c4ecc and f5ffbe1 needed update for AddressSets match.

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
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2025-11-17-025450

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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.

Comments