[202605][intfsorch]: Fence new RIF dependencies during interface removal by Xichen96 · Pull Request #4747 · sonic-net/sonic-swss

Xichen96 · 2026-07-13T00:38:16Z

What I did

Built a validation-only branch from the current 202605 head containing the complete dependency-ordered backport set.

The stack is:

Merged prerequisite #4758 — retain a VRF bind until batched IP removals drain.
#4746 — fence new local RIF dependencies while interface removal is pending.
#4766 — retain retryable loopback-action updates and ignore invalid action values without blocking other fields.
#4769 — use the local inband RIF/key/refcount for remote-system-port next hops.
#4772 — avoid inserting a missing bulk neighbor during lookup.
#4764 — retain and safely recreate an explicitly rehomed RIF after dependencies drain.
#4770 — retry remote next-hop work until the inband port exists and propagate retry through all callers.

The current 202605 base already includes #4777, the release-branch equivalent of the PR-CI dependency fix. No validation-only copy of the master CI commit is carried in this stack.

Why I did it

These PRs overlap in intfsorch.cpp, neighorch.cpp, and the mock test fixtures. Individual master builds do not prove that their target-branch conflict resolutions preserve every behavior when combined.

The final merge/backport order also matters:

batch 1:
    #4746, #4766, #4769, #4772

batch 2:
    #4764 after #4746 and #4766
    #4770 after #4769 and #4772

This PR validates that exact combined state against 202605, including merged prerequisite #4758. It is not a backport request and must not be merged.

How I verified it

The branch contains the focused mock and VS coverage from all six user PRs plus the [intfsorch]Fix race condition between VRF bind and ip address removal #4758 regression.
Manual conflict resolution preserved both sides of the overlapping changes:
- [intfsorch]: Retry loopback action update failures #4766 retry handling and [intfsorch]: Retry explicit router interface VRF rehome #4764 loopback-action state preservation;
- [neighorch]: Avoid inserting missing bulk neighbors #4772's non-mutating neighbor lookup and [neighorch]: Retry until inband port is available #4770's retry propagation;
- [intfsorch]: Fence new RIF dependencies during interface removal #4746 removal fencing and [neighorch]: Track remote next hops on inband RIF #4769 remote/inband RIF normalization.
Validation is PR-build only. No local or bjw-dev build is used.
Only a fresh full PR build against the 202605 base is accepted as target-branch evidence. A retried stage that merges current master is not sufficient.

Exact validation result

Head: d4b0502ecdac76d56fdf063a633045c0fb0de977
Azure PR build: 1171672 — in progress.
Required result: applicable build, Test vstest, and TestAsan vstest lanes complete successfully on the exact published head.

Details if related

Validation-only: do not merge this PR.
The Tested for 202605 branch label remains absent from the six real PRs until this exact stack completes PR CI.
After evidence is recorded in each real PR description, this validation PR will be closed.

mssonicbld · 2026-07-13T00:38:24Z

/azp run

azure-pipelines · 2026-07-13T00:38:39Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-07-13T14:10:22Z

/azp run

azure-pipelines · 2026-07-13T14:10:37Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

This PR updates IntfsOrch::setIntf to handle the missed-DEL VRF-bind race for non-loopback router interfaces by re-homing an already-created RIF into the configured VRF (when the interface has no IPs yet), ensuring the later IP2Me route is programmed into the correct virtual router. It also adds a mock test to cover the non-loopback missed-DEL scenario.

Changes:

Re-home an existing non-loopback router interface into the new VRF when a VRF-bind SET arrives without the preceding DEL and no IPs are present.
Add a mock test validating RIF remove+recreate behavior for the missed-DEL non-loopback VRF bind scenario and verifying no move occurs once an IP is present.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
orchagent/intfsorch.cpp	Adds re-home logic in `IntfsOrch::setIntf` for missed-`DEL` VRF bind updates on existing non-loopback interfaces with no IPs.
tests/mock_tests/intfsorch_ut.cpp	Adds `IntfsOrchVrfUpdateNonLoopback` unit test covering non-loopback missed-`DEL` VRF bind behavior and the “don’t move if IP exists” constraint.

mssonicbld · 2026-07-15T07:34:51Z

/azp run

azure-pipelines · 2026-07-15T07:35:01Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-15T08:14:37Z

/azp run

azure-pipelines · 2026-07-15T08:14:47Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-15T22:29:10Z

/azp run

azure-pipelines · 2026-07-15T22:29:19Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-16T07:56:58Z

/azp run

azure-pipelines · 2026-07-16T07:57:09Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-16T09:34:37Z

/azp run

azure-pipelines · 2026-07-16T09:34:49Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-17T04:09:38Z

/azp run

azure-pipelines · 2026-07-17T04:09:48Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-17T05:33:48Z

/azp run

azure-pipelines · 2026-07-17T05:33:58Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-17T09:46:44Z

/azp run

azure-pipelines · 2026-07-17T09:46:56Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-17T16:32:08Z

/azp run

azure-pipelines · 2026-07-17T16:32:20Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-18T05:47:54Z

/azp run

mssonicbld · 2026-07-22T15:33:50Z

/azp run

azure-pipelines · 2026-07-22T15:33:50Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

azure-pipelines · 2026-07-22T15:34:01Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-22T19:31:45Z

/azp run

azure-pipelines · 2026-07-22T19:31:45Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

azure-pipelines · 2026-07-22T19:31:56Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-22T23:14:27Z

/azp run

azure-pipelines · 2026-07-22T23:14:27Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

azure-pipelines · 2026-07-22T23:14:37Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-23T02:57:57Z

/azp run

azure-pipelines · 2026-07-23T02:57:57Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

azure-pipelines · 2026-07-23T02:58:07Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Treat an explicit all-zero MAC as a request to use the switch source MAC while leaving MAC-absent partial SETs unchanged. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: b6b568a1-5d2a-4309-b1ac-ef21ca155079 Signed-off-by: Xichen96 <lukelin0907@gmail.com>

mssonicbld · 2026-07-23T17:54:49Z

/azp run

azure-pipelines · 2026-07-23T17:54:59Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Xichen96 · 2026-07-23T20:40:42Z

Retrying CI once: build 1173111 regular and ASAN vstest both failed before pytest when the host preflight command sudo ip link del Vrf1 segfaulted (exit 139) on separate agents; no product test ran.

mssonicbld · 2026-07-23T20:40:52Z

/azp run

azure-pipelines · 2026-07-23T20:40:52Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

azure-pipelines · 2026-07-23T20:41:03Z

Azure Pipelines: Successfully started running 1 pipeline(s).

Xichen96 · 2026-07-24T17:50:55Z

/azpw run

mssonicbld · 2026-07-24T17:50:57Z

⚠️ Notice: /azpw run only runs failed jobs now. If you want to trigger a whole pipline run, please rebase your branch or close and reopen the PR.
💡 Tip: You can also use /azpw retry to retry failed jobs directly.

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-24T17:51:00Z

Retrying failed(or canceled) stages in build 1173201:

✅Stage TestAsan:

Job vstest: retried.

✅Stage Test:

Job vstest: retried.
Job vstest: retried.

Xichen96 force-pushed the dev/xichenlin/intfsorch-ip2me-vrf-bind-202605 branch from 0e2f73f to 4fa0bab Compare July 13, 2026 14:10

Xichen96 changed the title ~~[202605][intfsorch][intfmgr]: Install interface IP2Me route in the correct VRF on VRF bind~~ [202605][intfsorch]: Re-home router interface to the correct VRF on a missed-DEL VRF bind Jul 13, 2026

Xichen96 requested a review from Copilot July 13, 2026 18:43

Copilot started reviewing on behalf of Xichen96 July 13, 2026 18:43 View session

Copilot AI reviewed Jul 13, 2026

View reviewed changes

Xichen96 requested a review from prsunny July 16, 2026 05:40

Xichen96 force-pushed the dev/xichenlin/intfsorch-ip2me-vrf-bind-202605 branch from d219d1c to 3cececb Compare July 18, 2026 05:47

Xichen96 closed this Jul 22, 2026

Xichen96 reopened this Jul 22, 2026

Xichen96 closed this Jul 22, 2026

Xichen96 reopened this Jul 22, 2026

Xichen96 closed this Jul 23, 2026

Xichen96 reopened this Jul 23, 2026

Xichen96 closed this Jul 23, 2026

Xichen96 reopened this Jul 23, 2026

Uh oh!

Conversation

Xichen96 commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Exact validation result

Uh oh!

mssonicbld commented Jul 13, 2026

Uh oh!

azure-pipelines Bot commented Jul 13, 2026

Uh oh!

mssonicbld commented Jul 13, 2026

Uh oh!

azure-pipelines Bot commented Jul 13, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

mssonicbld commented Jul 15, 2026

Uh oh!

azure-pipelines Bot commented Jul 15, 2026

Uh oh!

mssonicbld commented Jul 15, 2026

Uh oh!

azure-pipelines Bot commented Jul 15, 2026

Uh oh!

mssonicbld commented Jul 15, 2026

Uh oh!

azure-pipelines Bot commented Jul 15, 2026

Uh oh!

mssonicbld commented Jul 16, 2026

Uh oh!

azure-pipelines Bot commented Jul 16, 2026

Uh oh!

mssonicbld commented Jul 16, 2026

Uh oh!

azure-pipelines Bot commented Jul 16, 2026

Uh oh!

mssonicbld commented Jul 17, 2026

Uh oh!

azure-pipelines Bot commented Jul 17, 2026

Uh oh!

mssonicbld commented Jul 17, 2026

Uh oh!

azure-pipelines Bot commented Jul 17, 2026

Uh oh!

mssonicbld commented Jul 17, 2026

Uh oh!

azure-pipelines Bot commented Jul 17, 2026

Uh oh!

mssonicbld commented Jul 17, 2026

Uh oh!

azure-pipelines Bot commented Jul 17, 2026

Uh oh!

mssonicbld commented Jul 18, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

azure-pipelines Bot commented Jul 23, 2026

Uh oh!

azure-pipelines Bot commented Jul 23, 2026

Xichen96 commented Jul 13, 2026 •

edited

Loading