fix: Avoid race when removing interfaces via NNCP [4.17] #2626

yossisegev · 2026-01-01T15:36:18Z

Removing an interface that was created using an NNCP, is done by editing the same NNCP. This sometimes resulted in a race, in which the NNCP success status actually presented the prvious status, leading to deleting the NNCP before the configuration was completed, leaving hanging interfaces in the cluster nodes, with node native interfaces occupied as the ports of these tests-created interfaces. A recent PR made this failed flow to always occur. This PR aims to assure that the timestamp of the AVAIALBLE status is updated for the recent change (the interface removal) and not the previous change (setup or modification).
This is a 4.17 backport of #2354

coderabbitai · 2026-01-01T15:36:24Z

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.

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

redhat-qe-bot2 · 2026-01-01T15:37:02Z

Report bugs in Issues

Welcome! 🎉

This pull request will be automatically processed with the following features:

🔄 Automatic Actions

Reviewer Assignment: Reviewers are automatically assigned based on the OWNERS file in the repository root
Size Labeling: PR size labels (XS, S, M, L, XL, XXL) are automatically applied based on changes
Issue Creation: A tracking issue is created for this PR and will be closed when the PR is merged or closed
Pre-commit Checks: pre-commit runs automatically if .pre-commit-config.yaml exists
Branch Labeling: Branch-specific labels are applied to track the target branch
Auto-verification: Auto-verified users have their PRs automatically marked as verified

📋 Available Commands

PR Status Management

/wip - Mark PR as work in progress (adds WIP: prefix to title)
/wip cancel - Remove work in progress status
/hold - Block PR merging (approvers only)
/hold cancel - Unblock PR merging
/verified - Mark PR as verified
/verified cancel - Remove verification status
/reprocess - Trigger complete PR workflow reprocessing (useful if webhook failed or configuration changed)

Review & Approval

/lgtm - Approve changes (looks good to me)
/approve - Approve PR (approvers only)
/automerge - Enable automatic merging when all requirements are met (maintainers and approvers only)
/assign-reviewers - Assign reviewers based on OWNERS file
/assign-reviewer @username - Assign specific reviewer
/check-can-merge - Check if PR meets merge requirements

Testing & Validation

/retest tox - Run Python test suite with tox
/retest python-module-install - Test Python package installation
/retest conventional-title - Validate commit message format
/retest all - Run all available tests

Container Operations

/build-and-push-container - Build and push container image (tagged with PR number)
- Supports additional build arguments: /build-and-push-container --build-arg KEY=value

Cherry-pick Operations

/cherry-pick <branch> - Schedule cherry-pick to target branch when PR is merged
- Multiple branches: /cherry-pick branch1 branch2 branch3

Label Management

/<label-name> - Add a label to the PR
/<label-name> cancel - Remove a label from the PR

✅ Merge Requirements

This PR will be automatically approved when the following conditions are met:

Approval: /approve from at least one approver
LGTM Count: Minimum 0 /lgtm from reviewers
Status Checks: All required status checks must pass
No Blockers: No WIP, hold, or conflict labels
Verified: PR must be marked as verified (if verification is enabled)

📊 Review Process

Approvers and Reviewers

Approvers:

myakove
rnetser

Reviewers:

dbasunag
myakove
omrirh
rnetser

Available Labels

hold
verified
wip
lgtm
approve
automerge

💡 Tips

WIP Status: Use /wip when your PR is not ready for review
Verification: The verified label is automatically removed on each new commit
Cherry-picking: Cherry-pick labels are processed when the PR is merged
Container Builds: Container images are automatically tagged with the PR number
Permission Levels: Some commands require approver permissions
Auto-verified Users: Certain users have automatic verification and merge privileges

For more information, please refer to the project documentation or contact the maintainers.

redhat-qe-bot2 · 2026-01-01T15:37:07Z

omrirh can not be added as reviewer. Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.: 422 {"message": "Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.", "documentation_url": "https://docs.github.com/rest/pulls/review-requests#request-reviewers-for-a-pull-request", "status": "422"}

yossisegev · 2026-01-01T16:31:31Z

/verified

Verified locally (not from an automated job) by running a test the configures a node bridge using an NNCP, and making sure that on the NNCP teardown
a - the NNCP doesn't get to success state immediately after it is being updated:

2026-01-01T18:00:33.984022 ocp_resources.resource INFO ResourceEdits: Updating data for resource NodeNetworkConfigurationPolicy l2-bridge-net-ys-417-rmzls-worker-0-mv4k9
2026-01-01T18:00:33.984383 ocp_resources NodeNetworkConfigurationPolicy INFO Update NodeNetworkConfigurationPolicy l2-bridge-net-ys-417-rmzls-worker-0-mv4k9:
{'spec': {'desiredState': {'interfaces': [{'name': 'br1test', 'type': 'linux-bridge', 'state': 'absent', 'bridge': {'options': {'stp': {'enabled': False}}, 'port': [{'name': 'enp9s0'}]}, 'ipv4': {'enabled': False, 'dhcp': False, 'auto-dns': True}, 'ipv6': {'enabled': False, 'dhcp': False, 'auto-dns': True, 'autoconf': False}}, {'name': 'enp9s0', 'type': 'ethernet', 'state': 'up', 'ipv4': {'enabled': False, 'forwarding': False}, 'ipv6': {'enabled': False}}]}}, 'metadata': {'name': 'l2-bridge-net-ys-417-rmzls-worker-0-mv4k9'}}
2026-01-01T18:00:34.181833 timeout_sampler INFO Waiting for 60 seconds [0:01:00], retry every 5 seconds. (Function: ocp_resources.node_network_configuration_policy._wait_for_nncp_status_update Args: (<utilities.network.LinuxBridgeNodeNetworkConfigurationPolicy object at 0x7f38d5df2510>,) Kwargs: {'initial_transition_time': '2026-01-01T15:56:12Z'})
2026-01-01T18:00:39.560143 timeout_sampler INFO Elapsed time: 5.169581174850464 [0:00:05.169581]
2026-01-01T18:00:39.560301 timeout_sampler INFO Waiting for 480 seconds [0:08:00], retry every 5 seconds. (Function: ocp_resources.node_network_configuration_policy.wait_for_status_success.lambda: self.next.instance.get)
2026-01-01T18:00:39.765671 ocp_resources NodeNetworkConfigurationPolicy INFO NNCP l2-bridge-net-ys-417-rmzls-worker-0-mv4k9 configured Successfully

the NNCP is being updated on 18:00:33.984022, and declared as successful after ~6 seconds, on 18:00:39.765671.

b - the bridge interface created by the NNCP no longer exists (doesn't appear in the NNS)

For extra verification, I executed the same scenario without the fix, and verified that
a - the NNCP is immediately declared as successful
b - the bridge interface remains in the node

Removing an interface that was created using an NNCP, is done by editing the same NNCP. This sometimes resulted in a race, in which the NNCP success status actually presented the prvious status, leading to deleting the NNCP before the configuration was completed, leaving hanging interfaces in the cluster nodes, with node native interfaces occupied as the ports of these tests-created interfaces. A recent PR made this failed flow to always occur. This PR aims to assure that the timestamp of the AVAIALBLE status is updated for the recent change (the interface removal) and not the previous change (setup or modification).

redhat-qe-bot2 · 2026-01-01T16:45:23Z

omrirh can not be added as reviewer. Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.: 422 {"message": "Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.", "documentation_url": "https://docs.github.com/rest/pulls/review-requests#request-reviewers-for-a-pull-request", "status": "422"}

yossisegev · 2026-01-01T16:45:29Z

/verified

Verified locally (not from an automated job) by running a test the configures a node bridge using an NNCP, and making sure that on the NNCP teardown
a - the NNCP doesn't get to success state immediately after it is being updated:

2026-01-01T18:00:33.984022 ocp_resources.resource INFO ResourceEdits: Updating data for resource NodeNetworkConfigurationPolicy l2-bridge-net-ys-417-rmzls-worker-0-mv4k9
2026-01-01T18:00:33.984383 ocp_resources NodeNetworkConfigurationPolicy INFO Update NodeNetworkConfigurationPolicy l2-bridge-net-ys-417-rmzls-worker-0-mv4k9:
{'spec': {'desiredState': {'interfaces': [{'name': 'br1test', 'type': 'linux-bridge', 'state': 'absent', 'bridge': {'options': {'stp': {'enabled': False}}, 'port': [{'name': 'enp9s0'}]}, 'ipv4': {'enabled': False, 'dhcp': False, 'auto-dns': True}, 'ipv6': {'enabled': False, 'dhcp': False, 'auto-dns': True, 'autoconf': False}}, {'name': 'enp9s0', 'type': 'ethernet', 'state': 'up', 'ipv4': {'enabled': False, 'forwarding': False}, 'ipv6': {'enabled': False}}]}}, 'metadata': {'name': 'l2-bridge-net-ys-417-rmzls-worker-0-mv4k9'}}
2026-01-01T18:00:34.181833 timeout_sampler INFO Waiting for 60 seconds [0:01:00], retry every 5 seconds. (Function: ocp_resources.node_network_configuration_policy._wait_for_nncp_status_update Args: (<utilities.network.LinuxBridgeNodeNetworkConfigurationPolicy object at 0x7f38d5df2510>,) Kwargs: {'initial_transition_time': '2026-01-01T15:56:12Z'})
2026-01-01T18:00:39.560143 timeout_sampler INFO Elapsed time: 5.169581174850464 [0:00:05.169581]
2026-01-01T18:00:39.560301 timeout_sampler INFO Waiting for 480 seconds [0:08:00], retry every 5 seconds. (Function: ocp_resources.node_network_configuration_policy.wait_for_status_success.lambda: self.next.instance.get)
2026-01-01T18:00:39.765671 ocp_resources NodeNetworkConfigurationPolicy INFO NNCP l2-bridge-net-ys-417-rmzls-worker-0-mv4k9 configured Successfully

the NNCP is being updated on 18:00:33.984022, and declared as successful after ~6 seconds, on 18:00:39.765671.

b - the bridge interface created by the NNCP no longer exists (doesn't appear in the NNS)

For extra verification, I executed the same scenario without the fix, and verified that
a - the NNCP is immediately declared as successful
b - the bridge interface remains in the node

yossisegev · 2026-01-04T10:49:41Z

/retest tox

redhat-qe-bot2 · 2026-01-04T12:09:50Z

omrirh can not be added as reviewer. Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.: 422 {"message": "Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.", "documentation_url": "https://docs.github.com/rest/pulls/review-requests#request-reviewers-for-a-pull-request", "status": "422"}

redhat-qe-bot · 2026-01-04T12:34:19Z

omrirh can not be added as reviewer. Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.: 422 {"message": "Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-python-wrapper repository.", "documentation_url": "https://docs.github.com/rest/pulls/review-requests#request-reviewers-for-a-pull-request", "status": "422"}

yossisegev · 2026-01-04T13:29:33Z

Replaced by #2628

redhat-qe-bot2 assigned yossisegev Jan 1, 2026

redhat-qe-bot2 requested a review from dbasunag January 1, 2026 15:37

redhat-qe-bot2 added branch-v4.17 size/S labels Jan 1, 2026

redhat-qe-bot2 requested review from myakove and rnetser January 1, 2026 15:37

redhat-qe-bot added the verified label Jan 1, 2026

yossisegev force-pushed the nncp-update-v4.17 branch from 6cf9bbd to 721d2a4 Compare January 1, 2026 16:44

yossisegev changed the title ~~[4.17] fix: Avoid race when removing interfaces via NNCP (#2347) (#2354)~~ fix: Avoid race when removing interfaces via NNCP [4.17] Jan 1, 2026

redhat-qe-bot2 removed the verified label Jan 1, 2026

rh-bot-1 added the verified label Jan 1, 2026

redhat-qe-bot2 removed the verified label Jan 4, 2026

Satisfy pre-commit and flake requirements

e7436da

yossisegev force-pushed the nncp-update-v4.17 branch from 2e80502 to e7436da Compare January 4, 2026 12:33

redhat-qe-bot2 added the needs-rebase label Jan 4, 2026

yossisegev closed this Jan 4, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Avoid race when removing interfaces via NNCP [4.17] #2626

fix: Avoid race when removing interfaces via NNCP [4.17] #2626

Uh oh!

yossisegev commented Jan 1, 2026

Uh oh!

coderabbitai bot commented Jan 1, 2026

Review skipped

Uh oh!

redhat-qe-bot2 commented Jan 1, 2026

Uh oh!

redhat-qe-bot2 commented Jan 1, 2026

Uh oh!

yossisegev commented Jan 1, 2026

Uh oh!

redhat-qe-bot2 commented Jan 1, 2026

Uh oh!

yossisegev commented Jan 1, 2026

Uh oh!

yossisegev commented Jan 4, 2026

Uh oh!

redhat-qe-bot2 commented Jan 4, 2026

Uh oh!

redhat-qe-bot commented Jan 4, 2026

Uh oh!

yossisegev commented Jan 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fix: Avoid race when removing interfaces via NNCP [4.17] #2626

fix: Avoid race when removing interfaces via NNCP [4.17] #2626

Uh oh!

Conversation

yossisegev commented Jan 1, 2026

Uh oh!

coderabbitai bot commented Jan 1, 2026

Review skipped

Uh oh!

redhat-qe-bot2 commented Jan 1, 2026

Welcome! 🎉

🔄 Automatic Actions

📋 Available Commands

PR Status Management

Review & Approval

Testing & Validation

Container Operations

Cherry-pick Operations

Label Management

✅ Merge Requirements

📊 Review Process

💡 Tips

Uh oh!

redhat-qe-bot2 commented Jan 1, 2026

Uh oh!

yossisegev commented Jan 1, 2026

Uh oh!

redhat-qe-bot2 commented Jan 1, 2026

Uh oh!

yossisegev commented Jan 1, 2026

Uh oh!

yossisegev commented Jan 4, 2026

Uh oh!

redhat-qe-bot2 commented Jan 4, 2026

Uh oh!

redhat-qe-bot commented Jan 4, 2026

Uh oh!

yossisegev commented Jan 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants