Skip to content

[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606 - #307

Merged
mssonicbld merged 2 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge
Sep 23, 2026
Merged

mssonicbld merged 2 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* f84f4f76 - (origin/202605) Fix multi-asic VoQ entries being silently dropped (#4905) (2026-09-19) [mssonicbld]<br>```

mssonicbld and others added 2 commits September 19, 2026 13:13
Do not drop notifications when its coming from a different asic.

Fixes: sonic-net/sonic-buildimage#27283

<!--
Please make sure you have read and understood the contribution guildlines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

1. Make sure your commit includes a signature generted with `git commit -s`
2. Make sure your commit title follows the correct format: [component]: description
3. Make sure your commit message contains enough details about the change and related tests
4. Make sure your pull request adds related reviewers, asignees, labels

Please also provide the following information in this pull request:
-->

**What I did**
Make changes to compare both hostnames and asic names for multi-asic devices. Improve unit test to check for this case.

**Why I did it**
Currently we only match the hostname and drop the notification if the hostname is equal to the hostname of the port. This also drops messages coming from a neigh asic that shares the same hostname.

**How I verified it**
Ran the new test here to verify it passes with this fix: sonic-net/sonic-mgmt#24826

This was verified in 202605 by patching this fix and the sonic-mgmt enhancement that tests for this exact regression: sonic-net/sonic-mgmt#24826

**Tested branches**
- [x] 202605
- [x] 202511

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
@azure-pipelines

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

@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
1 pipeline(s) were filtered out due to trigger conditions.

@mssonicbld
mssonicbld merged commit 67bf246 into Azure:202606 Sep 23, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant