sonic-swss: Code changes for WRED and ECN statistics

[rpmarvell]

• 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 : https://github.com/sonic-net/sonic-swss-common/pull/777

Expected order of dependent pull-request to be committed :

1. sonic-swss common pull request : https://github.com/sonic-net/sonic-swss-common/pull/777
2. sonic-sairedis pull request : https://github.com/sonic-net/sonic-sairedis/pull/1234
3. sonic-swss : pull request : https://github.com/sonic-net/sonic-swss/pull/2750
4. sonic-yang-model pull requests : https://github.com/sonic-net/sonic-buildimage/pull/14758
5. sonic-utilities pull request : https://github.com/sonic-net/sonic-utilities/pull/2807

[zhangyanzhao]

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

[rpmarvell]

@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]

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

[prsunny]

Please resolve conflicts

[kperumalbfn]

@rpmarvell Could you resolve the conflicts

[kperumalbfn]

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

[kperumalbfn]

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

[prsunny]

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

[kperumalbfn]

@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]

@rpmarvell , can you please look into the failure?

[rpmarvell]

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

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[rpmarvell]

The tests are running for more than 13hours.

[rpmarvell]

The tests are hanging for last two days. I have noticed that other PRs are also having this test hanging issue. For example : https://github.com/sonic-net/sonic-swss/pull/3476

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[rpmarvell]

@kperumalbfn , @prsunny : The tests are hanging for more than 18hours. Could you please let me know if it is being looked at.

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).

[mssonicbld]

/azp run

[azure-pipelines[bot]]

Azure Pipelines successfully started running 1 pipeline(s).