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.

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

Add qos_params.th5.yaml #14250

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

Conversation

rick-arista
Copy link

Description of PR

Adds static parameters for TH5 QoS tests

Summary:
Fixes # (issue)

Type of change

  • Bug fix

Back port request

  • 202311
  • 202405

Approach

What is the motivation for this PR?

Adds a baseline of parameters, which fixes the headroom pool size test.

How did you do it?

Values were generated by updated version of the generator script.

How did you verify/test it?

Manual test runs.

@r12f
Copy link
Contributor

r12f commented Sep 4, 2024

Rick is going to update this PR with latest parameter and test changes here. Then we will get it reviewed and merged.

@@ -2609,6 +2615,12 @@ def runTest(self):
(pkts_num_egr_mem + pkts_num_leak_out + pkts_num_dismiss_pfc +
hysteresis) // cell_occupancy + margin - 1
)
elif hwsku == 'Arista-7060X6-64PE-256x200G':
Copy link
Contributor

Choose a reason for hiding this comment

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

sync'ed offline. let's check TH5 for better change in the next PR.

Copy link
Contributor

@r12f r12f left a comment

Choose a reason for hiding this comment

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

lgtm.

@rick-arista rick-arista marked this pull request as draft September 17, 2024 16:34
@rick-arista
Copy link
Author

Moved this back to draft for a moment. There's an intermittent failure in one of the test cases due to the margin being 0. I'll update this PR after running the tests locally a few times to verify adding a small margin fixes this.

@rick-arista rick-arista marked this pull request as ready for review September 17, 2024 23:28
@r12f
Copy link
Contributor

r12f commented Sep 17, 2024

@Janetxxx , do you mind to cherry pick this PR to our test branch? This should get the qos tests fixed.

@Janetxxx
Copy link
Contributor

@Janetxxx , do you mind to cherry pick this PR to our test branch? This should get the qos tests fixed.
@r12f Done!

@rick-arista
Copy link
Author

@Janetxxx I've pushed another small fix that fixes flaky failures in testQosSaiHeadroomPoolWatermark

@@ -0,0 +1,199 @@
qos_params:
th5:
topo-t0-standalone-256:
Copy link
Contributor

Choose a reason for hiding this comment

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

@rick-arista , I believe we should use topo-t0-standalone-32 here, as it is consistent with our internal setup.

Copy link
Author

Choose a reason for hiding this comment

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

These params are generated for the 256 interface config. If you're testing with 32 interfaces I think they should still work, but you'll need to modify this ad hoc.

pg: 3
pkts_num_margin: 2
pkts_num_trig_ingr_drp: 121302
pkts_num_trig_pfc: 120117
Copy link

@li-pingmao li-pingmao Oct 22, 2024

Choose a reason for hiding this comment

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

@rick-arista How do you get pkts_num_trig_pfc: 120117?

@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...............................................................Passed
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/qos/test_qos_sai.py:2110:29: F821 undefined name 'qosConfigWrr'

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants