[QOS] Skip showing unnecessary warning message #3708
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
Signed-off-by: Vivek Reddy <[email protected]>
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
stephenxs
approved these changes
Jan 9, 2025
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
bingwang-ms
reviewed
Jan 13, 2025
config/main.py
Outdated
| @@ -793,7 +793,7 @@ def _wait_until_clear(tables, interval=0.5, timeout=30, verbose=False): | |||
| click.echo("Some entries matching {} still exist: {}".format(table, keys[0])) | |||
| time.sleep(interval) | |||
| empty = (non_empty_table_count == 0) | |||
| if not empty: | |||
| if not empty and timeout: | |||
There was a problem hiding this comment.
Suggest checking timeout != 0
There was a problem hiding this comment.
I've slightly updated the logic to also return True in case timeout is 0.
This is to be compatible with the following PR: #3710
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@bingwang-ms @kperumalbfn |
ayurkiv-nvda
pushed a commit
to ayurkiv-nvda/sonic-utilities
that referenced
this pull request
Jan 22, 2025
stepanblyschak
pushed a commit
to stepanblyschak/sonic-utilities
that referenced
this pull request
Jan 27, 2025
bingwang-ms
reviewed
Jan 27, 2025
config/main.py
Outdated
| @@ -793,6 +793,8 @@ def _wait_until_clear(tables, interval=0.5, timeout=30, verbose=False): | |||
| click.echo("Some entries matching {} still exist: {}".format(table, keys[0])) | |||
| time.sleep(interval) | |||
| empty = (non_empty_table_count == 0) | |||
| if timeout == 0: | |||
| empty = True | |||
There was a problem hiding this comment.
This code looks a little wired. How about checking the value of timeout and return True directly at the beginning of the function of _wait_until_clear? Or just skip calling this function _wait_until_clear when timeout == 0?
There was a problem hiding this comment.
Updated, Please check
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
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.
What I did
Don't show an unnecessary warning message (
Operation not completed successfully, please save and reload configuration.) during config qos reloadTo repro:
How I did it
When in traditional buffer mode, qos reload will not wait for tables to be cleared, so it will set the timeout to 0 in the _wait_until_clear call. But today, this prints an error log and exits.
Thus fixed to not print the error log when the timeout is zero.
How to verify it
UT and manual testing
Previous command output (if the output of a command-line utility has changed)
New command output (if the output of a command-line utility has changed)