Skip to content

[DPB]: Fix stale queue counter maps in COUNTERS_DB after port breakout #3982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[DPB]: Fix stale queue counter maps in COUNTERS_DB after port breakout #3982

wants to merge 5 commits into from
+147 −11

Conversation

@rminnikanti
Copy link
Contributor

@rminnikanti rminnikanti commented Nov 9, 2025 •
edited
Loading

Fixes #3983

What I did
Added cleanup of COUNTERS_*_NAME_MAP entries for a port during its deinit phase, and regenerated the NAME_MAP tables with fresh OIDs during port init when queue flex counters are already enabled.

Why I did it
After dynamic port breakout of a port, queue name map tables in the COUNTERS_DB table are not regenerated leaving stale entries resulting in CLI crash

How I verified it

# show queue counters Ethernet0
For namespace :
     Port    TxQ    Counter/pkts    Counter/bytes    Drop/pkts    Drop/bytes
---------  -----  --------------  ---------------  -----------  ------------
Ethernet0    UC0               0                0            0             0
Ethernet0    UC1               0                0            0             0
Ethernet0    UC2               0                0            0             0
Ethernet0    UC3               0                0            0             0
Ethernet0    UC4               0                0            0             0
Ethernet0    UC5               0                0            0             0
Ethernet0    UC6               0                0            0             0
Ethernet0    UC7               0                0            0             0

root@sonic:~# redis-dump -d 2 -k "COUNTERS_PORT_NAME_MAP*" | jq | grep Ethernet448
      "Ethernet448": "oid:0x100000000085c",
root@sonic:~#  redis-dump -d 2 -k "COUNTERS_QUEUE_PORT_MAP*" | jq | grep 0x100000000085c
      "oid:0x15000000000860": "oid:0x100000000085c",
      "oid:0x15000000000861": "oid:0x100000000085c",
      "oid:0x15000000000862": "oid:0x100000000085c",
      "oid:0x15000000000863": "oid:0x100000000085c",
      "oid:0x15000000000864": "oid:0x100000000085c",
      "oid:0x1500000000085d": "oid:0x100000000085c",
      "oid:0x1500000000085f": "oid:0x100000000085c",
      "oid:0x1500000000085e": "oid:0x100000000085c",
root@sonic:~# redis-dump -d 2 -k "COUNTERS_QUEUE_NAME_MAP*" | jq | grep -E "0x15000000000860|0x15000000000861|0x15000000000862|0x15000000000863|0x15000000000864|0x1500000000085d|0x1500000000085f|0x1500000000085e"
      "Ethernet448:6": "oid:0x15000000000863",
      "Ethernet448:2": "oid:0x1500000000085f",
      "Ethernet448:4": "oid:0x15000000000861",
      "Ethernet448:7": "oid:0x15000000000864",
      "Ethernet448:3": "oid:0x15000000000860",
      "Ethernet448:0": "oid:0x1500000000085d",
      "Ethernet448:5": "oid:0x15000000000862",
      "Ethernet448:1": "oid:0x1500000000085e",
root@sonic:~# redis-dump -d 2 -k "COUNTERS_QUEUE_INDEX_MAP*" | jq | grep -E "0x15000000000860|0x15000000000861|0x15000000000862|0x15000000000863|0x15000000000864|0x1500000000085d|0x1500000000085f|0x1500000000085e"
      "oid:0x15000000000860": "3",
      "oid:0x15000000000861": "4",
      "oid:0x15000000000862": "5",
      "oid:0x15000000000863": "6",
      "oid:0x15000000000864": "7",
      "oid:0x1500000000085d": "0",
      "oid:0x1500000000085f": "2",
      "oid:0x1500000000085e": "1",
root@sonic:~#  redis-dump -d 2 -k "COUNTERS_QUEUE_TYPE_MAP*" | jq | grep -E "0x15000000000860|0x15000000000861|0x15000000000862|0x15000000000863|0x15000000000864|0x1500000000085d|0x1500000000085f|0x1500000000085e"
      "oid:0x15000000000860": "SAI_QUEUE_TYPE_UNICAST",
      "oid:0x15000000000861": "SAI_QUEUE_TYPE_UNICAST",
      "oid:0x15000000000862": "SAI_QUEUE_TYPE_UNICAST",
      "oid:0x15000000000863": "SAI_QUEUE_TYPE_UNICAST",
      "oid:0x15000000000864": "SAI_QUEUE_TYPE_UNICAST",
      "oid:0x1500000000085d": "SAI_QUEUE_TYPE_UNICAST",
      "oid:0x1500000000085f": "SAI_QUEUE_TYPE_UNICAST",
      "oid:0x1500000000085e": "SAI_QUEUE_TYPE_UNICAST",

Details if related

@rminnikanti
[DPB]: Fix Stale queue counter mappings in COUNTERS_DB post port brea…
e4a615f 
…kout

Fix cleans up COUNTERS_*_NAME_MAP of the port during deinit of the port and
regenerate the NAME_MAP's with new OID's during port init if queue flex counters
are already enabled.

Signed-off-by: Ravi Minnikanti <[email protected]>
@rminnikanti rminnikanti requested a review from prsunny as a code owner November 9, 2025 10:15
@mssonicbld
Copy link
Collaborator

mssonicbld commented Nov 9, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Nov 9, 2025

Azure Pipelines successfully started running 1 pipeline(s).

rminnikanti
rminnikanti commented Nov 9, 2025
View reviewed changes
orchagent/high_frequency_telemetry/counternameupdater.cpp
{
SWSS_LOG_ENTER();

if (gHFTOrch)
Copy link
Contributor Author

@rminnikanti rminnikanti Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pterosaur can you please review?

@mssonicbld
Copy link
Collaborator

mssonicbld commented Nov 9, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Nov 9, 2025

Azure Pipelines successfully started running 1 pipeline(s).

Pterosaur
Pterosaur approved these changes Nov 10, 2025
View reviewed changes
Copy link
Contributor

@Pterosaur Pterosaur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kperumalbfn Could you please help to review this PR?
If we merge this PR, I will close my PR: #3967 that is duplicated.

kperumalbfn
kperumalbfn reviewed Nov 10, 2025
View reviewed changes
orchagent/portsorch.cpp
bool queueFcEnabled = flex_counters_orch->getQueueCountersState() ||
flex_counters_orch->getQueueWatermarkCountersState() ||
flex_counters_orch->getWredQueueCountersState();
if (queueFcEnabled && !p.m_queue_ids.empty())
Copy link
Contributor

@kperumalbfn kperumalbfn Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rminnikanti could you please check the DPB sonic-mgmt tests? If this is not covered, could you please add them?

Copy link
Contributor Author

@rminnikanti rminnikanti Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kperumalbfn I don't see DPB test component in PTF. As far as I understand, DPB testing in sonic-mgmt can be performed on ports that are not part of the topology.

The mock_tests included in this PR verifies the regeneration of the NAME_MAP's. I’ve also validated this behavior on a device and shared the redis-dump output in the PR description for reference.

kperumalbfn
kperumalbfn reviewed Nov 10, 2025
View reviewed changes
Copy link
Contributor

@kperumalbfn kperumalbfn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pterosaur could you close the PR - #3967

@Pterosaur Pterosaur mentioned this pull request Nov 10, 2025
Closed
@mssonicbld
Copy link
Collaborator

mssonicbld commented Nov 11, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Nov 11, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

mssonicbld commented Nov 13, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Nov 13, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@StormLiangMS
Copy link
Contributor

StormLiangMS commented Nov 13, 2025

/azp run Azure.sonic-swss

@azure-pipelines
Copy link

azure-pipelines bot commented Nov 13, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

mssonicbld commented Nov 16, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Nov 16, 2025

Azure Pipelines successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kperumalbfn kperumalbfn kperumalbfn approved these changes

@prsunny prsunny Awaiting requested review from prsunny prsunny is a code owner

+1 more reviewer

@Pterosaur Pterosaur Pterosaur approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Approved for msft-202412 Branch Cherry Pick Conflict_msft-202412 Request for msft-202412 Branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[DPB]: Stale queue counter mappings in COUNTERS_DB post port breakout

5 participants

@rminnikanti @mssonicbld @StormLiangMS @Pterosaur @kperumalbfn