Merged
Conversation
|
@maggiemsft, |
lguohan
approved these changes
Aug 2, 2017
zhixzhu
pushed a commit
to zhixzhu/sonic-mgmt
that referenced
this pull request
May 1, 2025
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: Fixes the failure of qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark for long->short. Recently a change went into the cisco-8000 platform that reduces the PFC threshold for long links. We need to reduce the values in qos parameters for this combination as well. In rx cgm profile, SQ drop if SQ occupancy > 115MB (PFC pause threshold 25MB + headroom size 90MB). Before change: Headroom drop is triggered at 14724 packets. There is 2 buffers padding in PFC pause threshold, and 2 buffers padding in headroom drop threshold. The number of packets to trigger rx drop is: ``` >>> 115*1024**2/8192+2+2 14724.0 ``` After change: SQ drop is triggered at 14722 packets. There is 2 buffers padding in SQ drop threshold. The number of packets to trigger rx drop is: ``` >>> 115*1024**2/8192+2 14722.0 ``` The meaning of pkts_num_trig_pfc in wm_pg_shared_lossless: the maximum packets reside in queue. So, need to decrease its value from 14723 to 14721. ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [X] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request - [ ] 202012 - [ ] 202205 - [ ] 202305 - [ ] 202311 - [X] 202405 - [X] 202411 ### Approach #### What is the motivation for this PR? Failure of qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark #### How did you do it? Its a simple change of parameters. #### How did you verify/test it? Ran it on T2 TB: ``` ====================================================================================================================== warnings summary ====================================================================================================================== ../../usr/local/lib/python3.8/dist-packages/paramiko/transport.py:236 /usr/local/lib/python3.8/dist-packages/paramiko/transport.py:236: CryptographyDeprecationWarning: Blowfish has been deprecated "class": algorithms.Blowfish, -- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html =========================================================================================================================== PASSES =========================================================================================================================== _________________________________________________________________________________________ TestQosSai.testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossless] __________________________________________________________________________________________ ___________________________________________________________________________________________ TestQosSai.testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossy] ___________________________________________________________________________________________ ____________________________________________________________________________________ TestQosSai.testQosSaiPgSharedWatermark[single_dut_multi_asic-wm_pg_shared_lossless] _____________________________________________________________________________________ _______________________________________________________________________________ TestQosSai.testQosSaiPgSharedWatermark[multi_dut_longlink_to_shortlink-wm_pg_shared_lossless] ________________________________________________________________________________ _______________________________________________________________________________ TestQosSai.testQosSaiPgSharedWatermark[multi_dut_shortlink_to_longlink-wm_pg_shared_lossless] ________________________________________________________________________________ ------------------------------------------------------ generated xml file: /run_logs/pfcwd-set/2025-04-29-00-09-47/qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark_2025-04-29-21-50-21.xml ------------------------------------------------------ INFO:root:Can not get Allure report URL. Please check logs ------------------------------------------------------------------------------------------------------------------- live log sessionfinish ------------------------------------------------------------------------------------------------------------------- 22:43:37 __init__.pytest_terminal_summary L0067 INFO | Can not get Allure report URL. Please check logs ================================================================================================================== short test summary info =================================================================================================================== PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossless] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossy] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_dut_multi_asic-wm_pg_shared_lossless] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[multi_dut_longlink_to_shortlink-wm_pg_shared_lossless] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[multi_dut_shortlink_to_longlink-wm_pg_shared_lossless] SKIPPED [3] qos/test_qos_sai.py:1678: The lossy test is not valid for multiAsic configuration. SKIPPED [2] qos/test_qos_sai.py:1640: Don't have 2 shortlink frontend nodes - so can't run multi_dut_shortlink_to_shortlinktests ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossless] - Failed: Processes "['analyze_logs--<MultiAsicSonicHost xx37-rp>']" failed with exit code "1" ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossy] - Failed: Processes "['analyze_logs--<MultiAsicSonicHost xx37-rp>']" failed with exit code "1" ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_dut_multi_asic-wm_pg_shared_lossless] - Failed: Processes "['analyze_logs--<MultiAsicSonicHost xx37-rp>']" failed with exit code "1" ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[multi_dut_longlink_to_shortlink-wm_pg_shared_lossless] - Failed: Processes "['analyze_logs--<MultiAsicSonicHost xx37-rp>']" failed with exit code "1" ERROR qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[multi_dut_shortlink_to_longlink-wm_pg_shared_lossless] - Failed: Processes "['analyze_logs--<MultiAsicSonicHost xx37-rp>']" failed with exit code "1" =============================================================================================== 5 passed, 5 skipped, 1 warning, 5 errors in 3194.02s (0:53:14) =============================================================================================== sonic@sonic-mgmt-DNT-msft-202405:/data/tests$ ``` The errors are from Log analyzer from a BGP container in RP, not related to this PR. #### Any platform specific information? Cisco-8000
kazinator-arista
pushed a commit
to kazinator-arista/sonic-mgmt
that referenced
this pull request
Mar 4, 2026
c98aba3 [psud] Fix PSU log issue (sonic-net#235) 60e9682 [ledd] prevent led crash on recirc port event (sonic-net#232)
kazinator-arista
pushed a commit
to kazinator-arista/sonic-mgmt
that referenced
this pull request
Mar 4, 2026
[rfc2737]: Handle unicode error when parsing transceiver (sonic-net#235) Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
kazinator-arista
pushed a commit
to kazinator-arista/sonic-mgmt
that referenced
this pull request
Mar 4, 2026
sonic-net#17851) #### Why I did it src/linkmgrd ``` * f5e9b54 - (HEAD -> 202305, origin/202305) [CodeQL] fix unmet build dependency (sonic-net#222) (10 hours ago) [Jing Zhang] * 2282cc5 - [active-standby] Probe the link in suspend timeout (sonic-net#235) (22 hours ago) [Longxiang Lyu] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.