Fix multi-asic behaviour for watermarkstat #3060
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
arista-nwolfe
force-pushed
the
multi-asic-watermarkstat
branch
from
f3adcf4 to
8221148
Compare
wenyiz2021
previously approved these changes
Apr 8, 2024
| self.execute(['watermarkstat', '-t', 'headroom_pool', '-n', 'asic1'], | ||
| expected_result=show_hdrm_pool_wm_output) | ||
|
|
||
| def test_show_invalid_asic_masic(self): |
There was a problem hiding this comment.
@bktsim-arista Few things -
- If no namespace specified, Will it show for all namespaces? if we specify, will it show for only that namespace ?
- Is this verified to be working fine on pizza box as well as chassis?
|
@bktsim-arista Can you please upate sonic-net/sonic-buildimage#15148 on which PR is handling which command for easy tracking ? |
kenneth-arista
force-pushed
the
multi-asic-watermarkstat
branch
from
8221148 to
bafefd4
Compare
|
@alpeshspatel : please help review |
…-watermark related commands. Previously, the following commands were not behaving correctly on multi-asic devices, as the '-n' namespace option was not available, and correct namespaces were not traversed on multi-asic devices. * show buffer_pool watermark/persistent-watermark * show headroom-pool watermark/persistent-watermark * show priority-group persistent-watermark/watermark * show queue persistent-watermark/watermark This change fixes multi-asic behaviour of CLI commands that rely on watermarkstat, as listed above.
kenneth-arista
force-pushed
the
multi-asic-watermarkstat
branch
from
bafefd4 to
1ec4974
Compare
- Added multi-asic support to clear functionality - Introduced a wrapper class for multi-asic - Added tests for multi-asic - Modified mock counters_db for tests - Replaced argparse with click - Fixed pre-commit formatting errors
kenneth-arista
force-pushed
the
multi-asic-watermarkstat
branch
from
1ec4974 to
a8860ef
Compare
|
The test failures are due to change in mock DB, will push a fix addressing it soon. |
|
Test snapshots from a mutli-asic T2 linecard: Show on the specified asic: watermarkstat -t q_shared_uni -n asic0
Show all asics when none specified:
Perform clear on a single asic and verify no other asic was modified
|
wenyiz2021
approved these changes
Sep 17, 2024
|
@bktsim-arista Please raise another PR to 202405 to address cherry-pick conflict. |
You can ping me or @kenneth-arista for this PR going ahead. Because the change touches pgdropstat, can we please get #3058 cherry-picked to 202405 first, this change has an overlap with the test files introduced in #3058 |
bingwang-ms
added
Approved for 202405 Branch
and removed
Cherry Pick Conflict_202405
labels
mssonicbld
pushed a commit
to mssonicbld/sonic-utilities
that referenced
this pull request
Nov 30, 2024
* Adds multi-asic support to watermarkstat, fixing watermark/persistent-watermark related commands. Previously, the following commands were not behaving correctly on multi-asic devices, as the '-n' namespace option was not available, and correct namespaces were not traversed on multi-asic devices. * show buffer_pool watermark/persistent-watermark * show headroom-pool watermark/persistent-watermark * show priority-group persistent-watermark/watermark * show queue persistent-watermark/watermark This change fixes multi-asic behaviour of CLI commands that rely on watermarkstat, as listed above.
|
Cherry-pick PR to 202405: #3641 |
mssonicbld
pushed a commit
that referenced
this pull request
Nov 30, 2024
* Adds multi-asic support to watermarkstat, fixing watermark/persistent-watermark related commands. Previously, the following commands were not behaving correctly on multi-asic devices, as the '-n' namespace option was not available, and correct namespaces were not traversed on multi-asic devices. * show buffer_pool watermark/persistent-watermark * show headroom-pool watermark/persistent-watermark * show priority-group persistent-watermark/watermark * show queue persistent-watermark/watermark This change fixes multi-asic behaviour of CLI commands that rely on watermarkstat, as listed above.
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
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
Added multi-asic support to watermarkstat, fixing watermark/persistent-watermark related commands. Previously, the following commands were not behaving correctly on multi-asic devices, as the '-n' namespace option was not available, and correct namespaces were not traversed on multi-asic devices.
This change fixes multi-asic behaviour of CLI commands that rely on watermarkstat as listed above.
This is a part of the set of changes being pushed for sonic-net/sonic-buildimage#15148
How I did it
Added namespace option
-nand used multi_asic library to implement multi_asic behaviour. Added relevant unit tests to ensure functionality.How to verify it
Run unit tests, or the commands as listed above.