Adding a fixture to set scheduler to slower speeds and revert it back.#15718
Merged
yejianquan merged 10 commits intosonic-net:masterfrom Dec 23, 2024
Merged
Adding a fixture to set scheduler to slower speeds and revert it back.#15718yejianquan merged 10 commits intosonic-net:masterfrom
yejianquan merged 10 commits intosonic-net:masterfrom
Conversation
Contributor
Author
|
Result from my run: |
Contributor
Author
|
Finally found a way to repeat tests: |
Contributor
Author
|
100G/S - 100G/S, mAsic: |
Contributor
Author
|
100G/S - 100G/S - sAsic: |
Contributor
Author
|
Final run result: I got this with the option "-e --count=10 -k testQosSaiDwrr" options. The 10 fails are due to long-long single-asic run, which is not a use case in qos-sai. |
Contributor
Author
|
I am not sure what the error means in the prechecks. @auspham , pls help. |
sdszhang
reviewed
Dec 7, 2024
tests/qos/qos_sai_base.py
Outdated
|
|
||
| # Set scheduler back to original speed. | ||
| self.copy_and_run_set_cir_script_cisco_8000( | ||
| dut=dst_dut, port=dst_port, asic=dst_index, speed=int(1.1*port_speed)) |
Contributor
There was a problem hiding this comment.
why we need to use 1.1*port_speed?
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
@rraghav-cisco tx enable/disable impacts scheduler rate. Need to adjust sequence of steps as below: |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
sdszhang
reviewed
Dec 20, 2024
tests/qos/qos_sai_base.py
Outdated
| # Set scheduler to 5 Gbps. | ||
| self.copy_and_run_set_cir_script_cisco_8000( | ||
| dut=dst_dut, | ||
| port=intf, |
Contributor
There was a problem hiding this comment.
Got this error:
for intf in interfaces:
# Set scheduler to 5 Gbps.
> self.copy_and_run_set_cir_script_cisco_8000(
dut=dst_dut,
port=intf,
asic=dst_index,
speed=5 * 1000 * 1000 * 1000)
E TypeError: copy_and_run_set_cir_script_cisco_8000() got an unexpected keyword argument 'port'
Contributor
Author
There was a problem hiding this comment.
@sdszhang , I apologize. I missed the update to this function in my previous commit. I have fixed it now. Thanks.
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
sdszhang
approved these changes
Dec 20, 2024
Collaborator
|
@rraghav-cisco PR conflicts with 202405 branch |
Collaborator
|
@rraghav-cisco |
Contributor
Author
@yejianquan : I will resolve the conflict. The set-back happens with tx_enable inside the ptf script. The function: sai_thrift_port_tx_enable() in the file: tests/saitests/py3/sai_qos_tests.py, which is run in PTF, basically reverts the scheduler to original state. |
Contributor
Author
|
@mssonicbld : PR for 202405: #16199 |
8 tasks
mssonicbld
pushed a commit
to mssonicbld/sonic-mgmt
that referenced
this pull request
Jan 13, 2025
sonic-net#15718) Description of PR Summary: Fixes the flakiness of DWRR testcase. The PR adds a new fixture that slows down the scheduler without changing the underlying algorithm. This allows the dWRR test to pass consitently. co-authorized by: jianquanye@microsoft.com
Collaborator
|
Cherry-pick PR to 202411: #16479 |
Merged
8 tasks
Contributor
|
202405 manual cherry pick PR #16199, merged. |
mssonicbld
pushed a commit
that referenced
this pull request
Jan 13, 2025
#15718) Description of PR Summary: Fixes the flakiness of DWRR testcase. The PR adds a new fixture that slows down the scheduler without changing the underlying algorithm. This allows the dWRR test to pass consitently. co-authorized by: jianquanye@microsoft.com
mssonicbld
added
Included in 202411 branch
and removed
Created PR to 202411 branch
labels
8 tasks
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
5 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.
Description of PR
Summary:
Fixes the flakiness of DWRR testcase. The PR adds a new fixture that slows down the scheduler without changing the underlying algorithm. This allows the dWRR test to pass consitently.
Type of change
Back port request
Approach
What is the motivation for this PR?
How did you do it?
How did you verify/test it?
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation