Fix test_qos_sai teardown for dualtor #13363
Merged
Conversation
This file contains 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
|
hi @XuChen-MSFT @lolyu this fix makes sense to me, could you help to take a look? |
StormLiangMS
approved these changes
Jun 21, 2024
mssonicbld
pushed a commit
to mssonicbld/sonic-mgmt
that referenced
this pull request
Jun 21, 2024
Approach What is the motivation for this PR? qos/test_qos_sai.py fails at teardown failed on setup with "Failed: All critical services should be fully started! Regression introduced by sonic-net#10651 for dualtor. How did you do it? The config_reload in the fixture dut_disable_ipv6 waits until all critical processes are up after issuing config reload command and it timeouts in case of dualtor because mux container doesn't come up. Mux container is disabled by another fixture stopServices in the same file. These two fixtures have no dependency on each other hence the execution can happen in any order, so if the teardown of dut_disable_ipv6 happens before stopServices then this issue is seen. This change ensures that the teardown of stopServices happens before dut_disable_ipv6 so that mux is no longer disabled at the time of config_reload. How did you verify/test it? Ran qos/test_qos_sai.py on Arista-7260CX3 platform with dualtor topology with 202305 and 202311 images.
|
Cherry-pick PR to 202305: #13401 |
9 tasks
mssonicbld
pushed a commit
that referenced
this pull request
Jun 21, 2024
Approach What is the motivation for this PR? qos/test_qos_sai.py fails at teardown failed on setup with "Failed: All critical services should be fully started! Regression introduced by #10651 for dualtor. How did you do it? The config_reload in the fixture dut_disable_ipv6 waits until all critical processes are up after issuing config reload command and it timeouts in case of dualtor because mux container doesn't come up. Mux container is disabled by another fixture stopServices in the same file. These two fixtures have no dependency on each other hence the execution can happen in any order, so if the teardown of dut_disable_ipv6 happens before stopServices then this issue is seen. This change ensures that the teardown of stopServices happens before dut_disable_ipv6 so that mux is no longer disabled at the time of config_reload. How did you verify/test it? Ran qos/test_qos_sai.py on Arista-7260CX3 platform with dualtor topology with 202305 and 202311 images.
mssonicbld
added
Included in 202305 branch
and removed
Created PR to 202305 branch
labels
XuChen-MSFT
added a commit
to XuChen-MSFT/sonic-mgmt
that referenced
this pull request
Jun 24, 2024
This reverts commit 20c8cdf.
8 tasks
|
@vivekverma-arista @StormLiangMS reverted in PR #13436 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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: Fix qos/tes_qos_sai.py teardown failure for dualtor.
Fixes #130
Type of change
Back port request
Approach
What is the motivation for this PR?
qos/test_qos_sai.py fails at teardown
Regression introduced by #10651 for dualtor.
How did you do it?
The config_reload in the fixture
dut_disable_ipv6waits until all critical processes are up after issuing config reload command and it timeouts in case of dualtor because mux container doesn't come up. Mux container is disabled by another fixturestopServicesin the same file. These two fixtures have no dependency on each other hence the execution can happen in any order, so if the teardown ofdut_disable_ipv6happens beforestopServicesthen this issue is seen.This change ensures that the teardown of
stopServiceshappens beforedut_disable_ipv6so that mux is no longer disabled at the time of config_reload.How did you verify/test it?
Ran qos/test_qos_sai.py on Arista-7260CX3 platform with dualtor topology with 202305 and 202311 images.
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation