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

sonic-swss: Code changes for WRED and ECN statistics #2750

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

sonic-swss: Code changes for WRED and ECN statistics #2750

wants to merge 2 commits into from

Conversation

rpmarvell
Copy link

@rpmarvell rpmarvell commented Apr 24, 2023 •
edited
Loading

  • New flex counter group for per-Queue WRED and ECN statistics

  • New flex counter group for per-Port WRED and ECN statistics

    Signed-off-by: [email protected]

What I did
WRED and ECN statistics support

Why I did it
Implemented as per the HLD : https://github.com/sonic-net/SONiC/blob/ebcd2a4a987f1d6027cd57677dc6806b8a9adcdb/doc/qos/ECN_and_WRED_statistics_HLD.md

How I verified it
Verfied it using Marvell DUT and SWSS unit tests.

Details if related

  • Two new flex counters added for per-Queue and per-Port WRED ECN statistics.

Build dependency on sonic-swss-common pull request : sonic-net/sonic-swss-common#777

Expected order of dependent pull-request to be committed :

  1. sonic-swss common pull request : swss-common: WRED and ECN statistics specific changes sonic-swss-common#777
  2. sonic-swss : pull request : sonic-swss: Code changes for WRED and ECN statistics #2750
  3. sonic-yang-model pull requests : sonic-yang-models: WRED statistics yang sonic-buildimage#14758
  4. sonic-utilities pull request : sonic-utilities: WRED stats feature changes on sonic-utilities sonic-utilities#2807
  5. sonic-sairedis pull request : sonic-sairedis : Wred stats feature changes on Sai-redis and Syncd sonic-sairedis#1234

@rpmarvell rpmarvell requested a review from prsunny as a code owner April 24, 2023 16:46
@rpmarvell rpmarvell mentioned this pull request Apr 24, 2023
Merged
@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from 72089a0 to 5029d36 Compare April 25, 2023 11:27
This was referenced Apr 25, 2023
Open
Merged
@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch 2 times, most recently from edac3bc to 5438892 Compare May 4, 2023 16:43
@rpmarvell rpmarvell mentioned this pull request May 9, 2023
Merged
msosyak
msosyak previously approved these changes May 9, 2023
View reviewed changes
@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from 5438892 to 7f47884 Compare May 12, 2023 21:56
stephenxs
stephenxs reviewed May 23, 2023
View reviewed changes
orchagent/flexcounterorch.cpp Outdated Show resolved Hide resolved
orchagent/portsorch.cpp Outdated Show resolved Hide resolved
orchagent/portsorch.cpp Show resolved Hide resolved
orchagent/portsorch.cpp Show resolved Hide resolved
orchagent/portsorch.cpp Show resolved Hide resolved
orchagent/portsorch.cpp Show resolved Hide resolved
@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from 6343045 to 294a61a Compare May 26, 2023 20:14
@zhangyanzhao
Copy link
Collaborator

@rpmarvell can you please fix the build failure? So that @prsunny can merge after it passed. Thanks.

@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch 3 times, most recently from 4b199bc to 6c49abb Compare June 16, 2023 08:48
@rpmarvell rpmarvell requested a review from stephenxs June 16, 2023 15:36
@rpmarvell
Copy link
Author

@rpmarvell can you please fix the build failure? So that @prsunny can merge after it passed. Thanks.

I have rebased the branch and it got fixed now.. Thank you..!

@zhangyanzhao
Copy link
Collaborator

@prsunny @msosyak @stephenxs can you please approve the PR and merge? Thanks.

@prsunny prsunny requested a review from neethajohn September 19, 2023 21:20
@prsunny
Copy link
Collaborator

prsunny commented Sep 19, 2023

Please resolve conflicts

@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from 6c49abb to 78b5dc1 Compare September 21, 2023 06:20
@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from f93bbbc to b9f2c1d Compare December 5, 2023 14:32
@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from 6880776 to 5912fdd Compare January 31, 2024 12:38
@kperumalbfn
Copy link
Contributor

@rpmarvell Could you resolve the conflicts

@kperumalbfn
Copy link
Contributor

@rpmarvell Could you add more tests for the code coverage? We could merge these changes for 202411 release.

image

@kperumalbfn
Copy link
Contributor

@rpmarvell Could you merge your branch to master and resolve any conflicts.

@prsunny
Copy link
Collaborator

prsunny commented Nov 4, 2024

@rpmarvell , reminder to rebase. Would like to get this for 202411 branch

@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from 694a5ae to 94ef5e0 Compare November 6, 2024 17:25
@kperumalbfn
Copy link
Contributor

@rpmarvell

There are failures related to WRED queue counters, pls check
test_flex_counters.py::TestFlexCounters::test_flex_counters[wred_queue_counter] FAILED [ 48%]

https://dev.azure.com/mssonic/build/_build/results?buildId=694021&view=logs&j=3f6395b2-1619-5ebe-f305-2aedcf353cb5&t=56fb64f8-b013-579d-11b0-5843431d20c9&l=1534

@prsunny
Copy link
Collaborator

prsunny commented Dec 4, 2024

@rpmarvell , can you please look into the failure?

@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch 2 times, most recently from e3caef3 to 71f837a Compare December 4, 2024 19:30
@rpmarvell
Copy link
Author

Finding the following error, I could also see the same issue in other PRs.

ERROR: failed to solve: process "/bin/sh -c dpkg -i /debs/libdashapi_1.0.0_amd64.deb /debs/libswsscommon_1.0.0_amd64.deb /debs/python3-swsscommon_1.0.0_amd64.deb /debs/sonic-db-cli_1.0.0_amd64.deb /debs/libsaimetadata_1.0.0_amd64.deb /debs/libsairedis_1.0.0_amd64.deb /debs/libsaivs_1.0.0_amd64.deb /debs/syncd-vs_1.0.0_amd64.deb /debs/swss_1.0.0_amd64.deb" did not complete successfully: exit code: 1

@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from 71f837a to 8a68866 Compare December 6, 2024 05:31
@rpmarvell
sonic-swss: Code changes for WRED and ECN statistics
b562b0d 
* New flex counter group for per-Queue WRED and ECN statistics
* New flex counter group for per-Port WRED and ECN statistics

Signed-off-by: rpmarvell <[email protected]>
@rpmarvell rpmarvell force-pushed the rpmarvell_wred_statistics_swss_changes branch from c24d638 to b562b0d Compare December 10, 2024 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephenxs stephenxs stephenxs approved these changes

@msosyak msosyak msosyak left review comments

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

@neethajohn neethajohn Awaiting requested review from neethajohn

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rpmarvell @zhangyanzhao @prsunny @kperumalbfn @stephenxs @msosyak