Skip to content
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

ADD VOQ COUNTERS(SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_ST…T_CREDIT_WD_DELETED_PACKETS) support for VOQ/Fabric switches #3152

Merged
merged 8 commits into from
Jun 10, 2024
Merged

ADD VOQ COUNTERS(SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_ST…T_CREDIT_WD_DELETED_PACKETS) support for VOQ/Fabric switches #3152

merged 8 commits into from
Jun 10, 2024

Conversation

saksarav-nokia
Copy link
Contributor

What I did
Added support for SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS stats counters for VOQ and Fabric type switches.

Why I did it
To read the drop counters

How I verified it
Simulated the error in BCM DNX switches (J2C+ and Ramon) and verified that the "show queue counter --voq" and "show dropcounters counts" shows the correct values.
Details if related

@saksarav-nokia
Copy link
Contributor Author

@vmittal-msft @rlhui, please review it

@saksarav-nokia
Copy link
Contributor Author

sonic-net/sonic-utilities#3322 adds the changes for show cli commands.

@saksarav-nokia saksarav-nokia mentioned this pull request May 15, 2024
Merged
@vmittal-msft vmittal-msft self-requested a review May 24, 2024 16:56
@lguohan
Copy link
Contributor

lguohan commented May 25, 2024

@vmittal-msft , please help to review?

vmittal-msft
vmittal-msft reviewed May 25, 2024
View reviewed changes
orchagent/fabricportsorch.cpp Outdated
@@ -24,6 +24,9 @@
#define FABRIC_DEBUG_POLLING_INTERVAL_DEFAULT (60)
#define FABRIC_MONITOR_DATA "FABRIC_MONITOR_DATA"
#define APPL_FABRIC_PORT_PREFIX "Fabric"
#define SWITCH_DEBUG_COUNTER_FLEX_COUNTER_GROUP "SWITCH_DEBUG_COUNTER"
#define SWITCH_DEBUG_COUNTER_POLLING_INTERVAL_MS 60000
Copy link
Contributor

Choose a reason for hiding this comment

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

@saksarav-nokia is this 60 secs ? Any reason we are picking 60 secs as polling ?

orchagent/switchorch.cpp Outdated Show resolved Hide resolved
orchagent/fabricportsorch.cpp Outdated Show resolved Hide resolved
orchagent/fabricportsorch.cpp Show resolved Hide resolved
@vmittal-msft
Copy link
Contributor

Also, Can you please rebase the code as well as add test cases for this ?

@saksarav-nokia saksarav-nokia force-pushed the saksarav-nokia-voq-counters branch 11 times, most recently from 3cd51ad to ee78f39 Compare May 30, 2024 16:23
@vmittal-msft
Copy link
Contributor

@saksarav-nokia please re-base.

@vmittal-msft
Copy link
Contributor

Thanks for taking care of comments. Please add test cases to cover these changes

@vmittal-msft
Copy link
Contributor

@prsunny please help merge this once VS tests passes. Also show commands tests are added (sonic-net/sonic-utilities#3322).

@saksarav-nokia
Copy link
Contributor Author

@prsunny please help merge this once VS tests passes. Also show commands tests are added (sonic-net/sonic-utilities#3322).

@vmittal-msft , @prsunny , Building vs image with latest master fails which delays my vstest. I have tried in few machines and see the same following errors. Any help would be appreciated.

server/test_arbitration.cpp:329: Failure
Value of: stream_teardown(std::move(stream)).ok()
Actual: false
Expected: true
[ FAILED ] TestArbitration.SingleThreadedClient (638 ms)
[----------] 5 tests from TestArbitration (1290 ms total)

[----------] Global test environment tear-down
[==========] 5 tests from 1 test suite ran. (1291 ms total)
[ PASSED ] 0 tests.
[ FAILED ] 5 tests, listed below:
[ FAILED ] TestArbitration.WriteNoPrimary
[ FAILED ] TestArbitration.DuplicateElectionId
[ FAILED ] TestArbitration.WriteAndPacketInAndPacketOut
[ FAILED ] TestArbitration.MaxConnections
[ FAILED ] TestArbitration.SingleThreadedClient

5 FAILED TESTS
FAIL test_server_arbitration (exit status: 1)

@saksarav-nokia
Add VS test for VOQ drop counter
e0d4cf7 
Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>
@saksarav-nokia
Update test_virtual_chassis.py
0ae755f
@saksarav-nokia
Update test_virtual_chassis.py
9b6d684
@saksarav-nokia
debug vs test failure
4e8b93b 
Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>
@saksarav-nokia
Fix the vs test failure
190eaf0 
Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>
@saksarav-nokia
Copy link
Contributor Author

@saksarav-nokia please rebase

@vmittal-msft , i rebased. please merge it.

@prsunny prsunny merged commit 70eb766 into sonic-net:master Jun 10, 2024
17 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-swss that referenced this pull request Jun 12, 2024
@saksarav-nokia @mssonicbld
ADD VOQ COUNTERS(SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_ST……
9855250 
…T_CREDIT_WD_DELETED_PACKETS) support for VOQ/Fabric switches (sonic-net#3152)

What I did
Added support for SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS stats counters for VOQ and Fabric type switches.

Why I did it
To read the drop counters
@mssonicbld mssonicbld mentioned this pull request Jun 12, 2024
Merged
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202405: #3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!!
#3197

6 similar comments
@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!!
#3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!!
#3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!!
#3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!!
#3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!!
#3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!!
#3197

yejianquan pushed a commit to yejianquan/sonic-swss that referenced this pull request Jul 8, 2024
@saksarav-nokia @yejianquan
ADD VOQ COUNTERS(SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_ST……
ef97262 
…T_CREDIT_WD_DELETED_PACKETS) support for VOQ/Fabric switches (sonic-net#3152)

What I did
Added support for SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS stats counters for VOQ and Fabric type switches.

Why I did it
To read the drop counters
@yejianquan yejianquan mentioned this pull request Jul 8, 2024
Draft
@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!! Auto cherry pick PR will be closed in 3 days.
#3197

3 similar comments
@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!! Auto cherry pick PR will be closed in 3 days.
#3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!! Auto cherry pick PR will be closed in 3 days.
#3197

@mssonicbld
Copy link
Collaborator

@saksarav-nokia cherry pick PR didn't pass PR checker. Please check!!! Auto cherry pick PR will be closed in 3 days.
#3197

mssonicbld pushed a commit that referenced this pull request Jul 12, 2024
@saksarav-nokia @mssonicbld
ADD VOQ COUNTERS(SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_ST……
b16d6b2 
…T_CREDIT_WD_DELETED_PACKETS) support for VOQ/Fabric switches (#3152)

What I did
Added support for SAI_SWITCH_STAT_PACKET_INTEGRITY_DROP, SAI_QUEUE_STAT_CREDIT_WD_DELETED_PACKETS stats counters for VOQ and Fabric type switches.

Why I did it
To read the drop counters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prsunny prsunny prsunny approved these changes

@vmittal-msft vmittal-msft vmittal-msft approved these changes

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

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

Assignees

@vmittal-msft vmittal-msft

Labels
Approved for 202405 Branch chassis Included in 202405 Branch Request for 202405 Branch
Projects
SONiC Chassis
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@saksarav-nokia @lguohan @vmittal-msft @mssonicbld @prsunny @judyjoseph @bingwang-ms