-
Notifications
You must be signed in to change notification settings - Fork 1k
fix the route check monit error seen when test_route_consistency.py #16586
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
Closed
+21
−0
Closed
Changes from all commits
Commits
Show all changes
60 commits
Select commit
Hold shift + click to select a range
febcacd
Added test case to verify ebtables rules.
abdosi 9582616
Merge remote-tracking branch 'upstream/master'
abdosi 940ebe4
Merge remote-tracking branch 'upstream/master'
abdosi 36feb13
Merge remote-tracking branch 'upstream/master'
abdosi ab4beee
Merge remote-tracking branch 'upstream/master'
abdosi 8d59326
Merge remote-tracking branch 'upstream/master'
abdosi fa03609
Merge remote-tracking branch 'upstream/master'
abdosi 532639a
Merge remote-tracking branch 'upstream/master'
abdosi 0833669
Merge remote-tracking branch 'upstream/master'
abdosi f2dbf92
Merge remote-tracking branch 'upstream/master'
abdosi 915dc97
Merge remote-tracking branch 'upstream/master'
abdosi 1aacc7a
Merge remote-tracking branch 'upstream/master'
abdosi 6ca8577
Merge remote-tracking branch 'upstream/master'
abdosi 7ad4900
Merge remote-tracking branch 'upstream/master'
abdosi a6d5c16
Fix to avoid overlap of Front Port Channel and Internal Pot Channel
abdosi 03453b0
Merge remote-tracking branch 'upstream/master'
abdosi 5fce19c
Merge remote-tracking branch 'upstream/master'
abdosi 501698b
Merge branch 'master' of https://github.com/abdosi/sonic-mgmt
abdosi 9d6f058
Merge remote-tracking branch 'upstream/master'
abdosi e7b6504
Merge remote-tracking branch 'upstream/master'
abdosi 402c17c
Merge remote-tracking branch 'upstream/master'
abdosi fe770ed
Increase wait time for link up post config reload/minigraph for modular
abdosi dddc82a
Merge remote-tracking branch 'upstream/master'
abdosi c3f8665
Merge remote-tracking branch 'upstream/master'
abdosi c17e4f5
Increased socket buffer for PTF while running QoS test
abdosi 3878c7d
Merge branch 'master' of https://github.com/abdosi/sonic-mgmt
abdosi 6266b90
Merge remote-tracking branch 'upstream/master'
abdosi 37f880d
Merge remote-tracking branch 'upstream/master'
abdosi 00a0dc6
Merge remote-tracking branch 'upstream/master'
abdosi a3a5999
Merge branch 'sonic-net:master' into master
abdosi 9f1a2a7
Update nexthopgroup mapping for td3
abdosi f07b31e
Update config_reload.py
abdosi 03fe4fe
Merge branch 'master' of https://github.com/abdosi/sonic-mgmt
abdosi 825c8b2
Fix pre-commit
abdosi 0b954ec
Merge remote-tracking branch 'upstream/master'
abdosi 7293537
Fix for https://github.com/sonic-net/sonic-buildimage/issues/19174
abdosi 67a8074
Update multi_asic.py
abdosi 5176515
Fix Precommit
abdosi 1b687e1
With recent changes were AZNG routes on upstream LC are not published…
abdosi d1fd527
Merge branch 'master' of https://github.com/abdosi/sonic-mgmt
abdosi 2d140c7
Fix the Pre static Analysis
abdosi fb344dc
Merge branch 'sonic-net:master' into master
abdosi 720958f
Added test case to verify AZNG Migration script steps
abdosi 3a6b5e7
Fix pre test failure
abdosi 9601ca9
Merge branch 'sonic-net:master' into master
abdosi 1e69191
Added new test case to validate LAG MEMBER SAI attribute SAI_LAG_MEMB…
abdosi 810fb3f
More Changes
abdosi c22c018
More Changes
abdosi 7105ba2
fixed error
abdosi e22544a
More changes
abdosi ad89ac6
Merge branch 'sonic-net:master' into master
abdosi 82ab4f0
More changes
abdosi 0faf391
Fix prestatic analysis
abdosi c6a47a2
Update test_lag_member_forwarding.py
abdosi d009c10
Fix pre-static analysis failure
abdosi b9dcc34
Merge branch 'sonic-net:master' into master
abdosi 18c67fc
Update minigraph_meta.j2
abdosi 859493b
Merge branch 'sonic-net:master' into master
abdosi bb477c8
Update test_route_consistency.py
abdosi 704cc92
Merge branch 'sonic-net:master' into master
abdosi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,27 @@ | |
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
| @pytest.fixture(scope='function', autouse=True) | ||
| def check_and_disable_routecheck(duthosts): | ||
| # Previous test can create route inconsistency for 1-2 cycle | ||
| # and anoter cycle as part of this test can cause failure of this test because of monit ERR. | ||
| # To mitigate this make sure route_check is clean before starting the test and if so than restart | ||
| # monit route check to reset it's error check counter | ||
| for duthost in duthosts: | ||
| if duthost.is_supervisor_node(): | ||
| continue | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe make it as a sanity check? |
||
| rc = duthost.shell("sudo route_check.py", module_ignore_errors=True) | ||
| if rc['rc'] != 0: | ||
| pytest.fail("route_check fail in test pre-setup stage") | ||
|
|
||
| duthost.shell("sudo monit restart routeCheck") | ||
| yield | ||
| for duthost in duthosts: | ||
| if duthost.is_supervisor_node(): | ||
| continue | ||
| rc = duthost.shell("sudo route_check.py", module_ignore_errors=True) | ||
| if rc['rc'] != 0: | ||
| pytest.fail("route_check fail in test post-route stage") | ||
|
|
||
| def check_and_kill_process(duthost, container_name, program_name): | ||
| """Checks the running status of a critical process. If it is running, kill it. Otherwise, | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the function could be used in wide scope and before every function in the future.
monit restart could be fast, but route_check could be slow
Can we use SafeThreadPoolExecutor to run them in parallel?