[code sync] Merge sonic-net/sonic-swss:202605 into 202606 - #305
Merged
yijingyan2 merged 2 commits intoSep 23, 2026
Merged
Conversation
* [nbrmgr]: Preserve failed IPv6 neighbors as incomplete What I did Backported event-driven, best-effort handling for failed IPv6 kernel neighbors on dual-ToR systems. neighsyncd records failed neighbors in NEIGH_FAILED_TABLE, and nbrmgrd subscribes to that table only on dual-ToR devices, attempts to move each entry to INCOMPLETE through the existing fire-and-forget netlink send path, and sends one Neighbor Solicitation. Each notification is processed once. The table entry remains while the neighbor is unresolved and is removed when the kernel neighbor reaches a valid state or is deleted. Why I did it Failed IPv6 neighbors must remain in INCOMPLETE state so they can be resolved by a later Neighbor Advertisement, rather than returning to FAILED through the kernel retry timer. Sending one Neighbor Solicitation provides an immediate resolution attempt without enabling recurring kernel probes.
Resolve the failed-neighbor conflicts while preserving the Azure EVPN-MH neighbor handling and both mock-test targets. Signed-off-by: Elastictest AI Worker <sonicbld@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Collaborator
Author
|
/azp run |
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
yijingyan2
approved these changes
Sep 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Repairs the code-sync conflict reported by work item 39741365 from pipeline build 1224563.
This merge preserves the exact public source commit
7d9239a091f8ceeb930937e45d48bd5c331701f9from the live202605mapping and merges it intoAzure/sonic-swss.msft:202606, starting atadf418dff17f95c8e8b6fba1f2bd5a2ce4797190.Conflict resolution
neighsyncd/neighsync.cpp: integrated the failed IPv6-neighbor publication/cleanup flow before EVPN probe filtering, while retaining Azure's four-argument constructor, EVPN NVO subscription, NOARP handling, and host-route cleanup.neighsyncd/neighsync.h: retained the Azure EVPN route/cache state and added the failed-neighbor producer/check tables.tests/mock_tests/Makefile.am: retained the Azurefdbsyncdunit-test target and added the sourceneighsyncdunit-test target.neighsyncdfixture to call the retained four-argument constructor.The resulting merge commit has parent 1
adf418dff17f95c8e8b6fba1f2bd5a2ce4797190and parent 27d9239a091f8ceeb930937e45d48bd5c331701f9; the exact source commit is confirmed in its ancestry. The final change scope is the same seven paths changed by the source commit.Validation
git diff --cached --checkcompleted cleanly before publication.tests_fdbsyncdandtests_neighsyncdremain registered. No executable build/test runner is exposed in this worker, so PR CI must run the compiled mock tests.