[watermarkstat] Add new warning message for the 'q_shared_multi' counters #9
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
scripts/watermarkstat
Outdated
| @@ -201,7 +201,7 @@ class Watermarkstat(object): | |||
|
|
|||
| return pg_index | |||
|
|
|||
| def build_header(self, wm_type): | |||
| def build_header(self, wm_type, key): | |||
There was a problem hiding this comment.
key -> counter_type_key
scripts/watermarkstat
Outdated
| print("Object map is empty!", file=sys.stderr) | ||
| sys.exit(1) | ||
| else: | ||
| print("Object map from COUNTERS_DB is empty, because counters are not configured in CONFIG_DB!") |
There was a problem hiding this comment.
because counters are not configured in CONFIG_DB! -> because multicast queues are not configured in CONFIG_DB
scripts/watermarkstat
Outdated
| @@ -220,8 +220,12 @@ class Watermarkstat(object): | |||
| min_idx = element_idx | |||
|
|
|||
| if min_idx == sys.maxsize: | |||
| print("Object map is empty!", file=sys.stderr) | |||
| sys.exit(1) | |||
| if key not in ['q_shared_multi', 'q_shared_all']: | |||
There was a problem hiding this comment.
delete q_shared_all
vadymhlushko-mlnx
force-pushed
the
202205-watermarkstat-fixes
branch
from
5d56243
to
4ac1c9b
Compare
vadymhlushko-mlnx
changed the title
…ters in case if they not in COUNTES_DB Signed-off-by: Vadym Hlushko <[email protected]>
vadymhlushko-mlnx
force-pushed
the
202205-watermarkstat-fixes
branch
from
4ac1c9b
to
975ba13
Compare
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.
Signed-off-by: Vadym Hlushko [email protected]
What I did
Add a new warning message for the 'q_shared_multi' counter and not perform the exit with error code (1) because of the new implementation sonic-swss/pull/2432 from now on there is a valid case if there are no multicast counters inside the
COUNTERS_DB.In order for multicast counters to be presented in
COUNTERS_DBthe appropriate queues should be configured inside theCONFIG_DB(e.g"BUFFER_QUEUE|Ethernet14|7-8")How I did it
Change the
watermarkstatscriptHow to verify it
Run the sonic-mgmt/tests/iface_namingmode/test_iface_namingmode.py
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)