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-sairedis : Wred stats feature changes on Sai-redis and Syncd #1234

Merged
merged 1 commit into from
Feb 4, 2025
Merged

sonic-sairedis : Wred stats feature changes on Sai-redis and Syncd #1234

merged 1 commit into from
Feb 4, 2025

Conversation

rpmarvell
Copy link
Contributor

@rpmarvell rpmarvell commented Apr 24, 2023 •
edited
Loading

  • Stats capability query API support is added

Details :

  • Changes are done to support the stats capability query from Swss to SAI.
  • This was implemented as part of WRED and ECN statistics
  • Statistics capability query is implemented in sairedis/syncd

HLD : https://github.com/sonic-net/SONiC/blob/master/doc/qos/ECN_and_WRED_statistics_HLD.md

Expected order of pull-request commits :

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

This was referenced Apr 25, 2023
Merged
Merged
@rpmarvell rpmarvell force-pushed the rpmarvell_wredstats_sairedis branch from d8bbe32 to 5da8294 Compare April 25, 2023 16:40
@rpmarvell rpmarvell mentioned this pull request Apr 26, 2023
Merged
10 tasks
@rpmarvell rpmarvell force-pushed the rpmarvell_wredstats_sairedis branch from 5da8294 to 838bc2e Compare May 1, 2023 08:06
@kcudnik
Copy link
Collaborator

kcudnik commented May 4, 2023

please fix errors

@rpmarvell
Copy link
Contributor Author

This PR is dependent on swss-common PR 777 as i have mentioned in the description. Hence the errors. Could you please review and approve the swss-common PR if possible..! Thank you

msosyak
msosyak previously approved these changes May 8, 2023
View reviewed changes
@rpmarvell rpmarvell mentioned this pull request May 9, 2023
Merged
stephenxs
stephenxs reviewed May 25, 2023
View reviewed changes
@rpmarvell rpmarvell force-pushed the rpmarvell_wredstats_sairedis branch from 838bc2e to 8d57f14 Compare May 29, 2023 10:15
@kcudnik
Copy link
Collaborator

kcudnik commented May 29, 2023

please fix build errors

@rpmarvell
Copy link
Contributor Author

please fix build errors

sonic-sairedis is dependent on sonic-swss-common PR https://github.com/sonic-net/sonic-swss-common/pull/777 .
This sonic-swss-common PR has already been approved by maintainer but we are facing issues in merging this PR as the CI is unstable.
There is an issue raised for this in the SONiC community by Myron Sosyak, Link for this issue : sonic-net/sonic-swss-common#784

@stephenxs
Copy link
Contributor

Hi @rpmarvell
Please refer to my latest comment. I'm not able to unresolve a comment
Thanks

@akokhan
Copy link
Contributor

akokhan commented May 31, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@akokhan
Copy link
Contributor

akokhan commented Jun 2, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@akokhan
Copy link
Contributor

akokhan commented Jun 2, 2023

@rpmarvell , even swss-common changes are merged, sairedis CI is still failing. Please check.

@rpmarvell rpmarvell force-pushed the rpmarvell_wredstats_sairedis branch from 8d57f14 to 6b6d297 Compare June 3, 2023 17:37
@rpmarvell
Copy link
Contributor Author

Hi @rpmarvell Please refer to my latest comment. I'm not able to unresolve a comment Thanks

I have addressed your review comment. Thank you!

@rpmarvell rpmarvell force-pushed the rpmarvell_wredstats_sairedis branch 8 times, most recently from 68b4d42 to 380553f Compare June 4, 2023 10:31
@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell
Copy link
Contributor Author

@kcudnik : Tests are green. Could you please help with pushing/merging the changes.

@kcudnik kcudnik merged commit be0c83d into sonic-net:master Feb 4, 2025
15 checks passed
@stephenxs stephenxs mentioned this pull request Feb 7, 2025
Open
@stephenxs stephenxs mentioned this pull request Feb 13, 2025
Merged
@r12f
Copy link
Contributor

r12f commented Feb 21, 2025

hi @rpmarvell , do you mind to help create a manual PR for this cherry pick?

202412 branch is in: https://github.com/Azure/sonic-sairedis.msft.

@r12f
Copy link
Contributor

r12f commented Feb 24, 2025 •
edited
Loading

hi @rpmarvell , gently ping on this one again. It is currently blocking this PR at this moment: #1457.

@r12f r12f mentioned this pull request Feb 28, 2025
Closed
mssonicbld added a commit to mssonicbld/sonic-swss.msft that referenced this pull request Feb 28, 2025
@mssonicbld
sonic-swss: Code changes for WRED and ECN statistics
8c1be63 
* 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]

<!--
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**
WRED and ECN statistics support

**Why I did it**
Implemented as per the HLD : https://github.com/sonic-net/SONiC/blob/master/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 : sonic-net/sonic-swss-common#777
2) sonic-yang-model pull requests : sonic-net/sonic-buildimage#14758
3) sonic-sairedis pull request : sonic-net/sonic-sairedis#1234
4) sonic-swss : pull request : sonic-net/sonic-swss#2750
5) sonic-utilities pull request : sonic-net/sonic-utilities#2807
@mssonicbld mssonicbld mentioned this pull request Feb 28, 2025
Merged
@r12f
Copy link
Contributor

r12f commented Feb 28, 2025

hi @rpmarvell , do you mind to help create a manual PR for this cherry pick?

202412 branch is in: https://github.com/Azure/sonic-sairedis.msft.

mssonicbld added a commit to Azure/sonic-swss.msft that referenced this pull request Feb 28, 2025
@mssonicbld
sonic-swss: Code changes for WRED and ECN statistics (#46)
8c99374 
* 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]

<!--
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**
WRED and ECN statistics support

**Why I did it**
Implemented as per the HLD : https://github.com/sonic-net/SONiC/blob/master/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 : sonic-net/sonic-swss-common#777
2) sonic-yang-model pull requests : sonic-net/sonic-buildimage#14758
3) sonic-sairedis pull request : sonic-net/sonic-sairedis#1234
4) sonic-swss : pull request : sonic-net/sonic-swss#2750
5) sonic-utilities pull request : sonic-net/sonic-utilities#2807
@r12f r12f mentioned this pull request Feb 28, 2025
Merged
@r12f r12f mentioned this pull request Feb 28, 2025
Merged
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

@kcudnik kcudnik kcudnik approved these changes

@msosyak msosyak Awaiting requested review from msosyak

Assignees
No one assigned
Labels
Approved for msft-202412 Branch Included in msft-202412 Branch Request for msft-202412 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@rpmarvell @kcudnik @stephenxs @akokhan @zhangyanzhao @kperumalbfn @mssonicbld @r12f @msosyak @dprital