Skip to content

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202511_azd - #290

Merged
mssonicbld merged 2 commits into
Azure:202511_azdfrom
mssonicbld:sonicbld/202511_azd-merge
Aug 31, 2026
Merged

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202511_azd#290
mssonicbld merged 2 commits into
Azure:202511_azdfrom
mssonicbld:sonicbld/202511_azd-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* 7917e3d7 - (origin/202511) [buffermgrd]: Clean PFC status on port deletion from qos_map table (#4848) (2026-08-31) [mssonicbld]<br>```

mssonicbld and others added 2 commits August 31, 2026 09:36
…4848)

**Why I did it:**
Previously, when a port was deleted from the PORT_QOS_MAP table, the m_portPfcStatus map could retain stale information about the port's PFC (Priority Flow Control) status. This could lead to inconsistencies in buffer management, as the system might attempt to use outdated PFC status for ports that no longer exist or have been reconfigured. This could happen when CABLE_LENGTH for the port is set.

**How I did it:**
By erasing the port's entry from m_portPfcStatus upon receiving a delete command, the fix ensures that the internal state accurately reflects the current configuration, preventing potential misconfigurations or resource leaks.

**How to verify it:**
Run the following UT test case
test_buffer_traditional.py::TestBuffer::test_no_buffer_pg_for_no_port_qos_map

**Which release branch to backport (provide reason below if selected):**
- [x] 202505
- [x] 202511

**Tested branch (Please provide the tested image version):**
- [x] 202505

<!--
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:
-->

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
mssonicbld merged commit 42aa371 into Azure:202511_azd Aug 31, 2026
2 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