[portstat pfcstat] Unify the packet number format in the output of portstat and pfcstat in all cases #1755
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 @neethajohn not sure whether you are the right person to review this PR, if not, would you please suggest? |
smaheshm
approved these changes
Aug 26, 2021
|
@neethajohn @abdosi are we good to go? |
|
This commit could not be cleanly cherry-pick to 202012. Please submit another PR. |
judyjoseph
pushed a commit
that referenced
this pull request
Sep 2, 2021
…rtstat and pfcstat in all cases (#1755) #### What I did Unify the packet number format in the output of "portstat" and "pfcstat" for all cases. In some cases, the packet numbers in the output of these two commands are formatted with a comma, in some cases not. This is because only when the numbers are treated by function `ns_diff`, it will format the numbers with commas: `return '{:,}'.format(max(0, new - old))` , but `ns_diff` is not called in all cases. **for example, packet numbers in the output are NOT formatted with commas:** ``` pfcstat root@r-qa-sw-eth-2133:/home/admin# pfcstat Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7 ----------- ------ ------ ------ ------ ------ ------ ------ ------ Ethernet120 0 0 0 0 0 0 0 0 Ethernet124 137407 0 45659 45660 0 45662 0 0 <-----FORMAT OF DATA BEFORE clear counters portstat portstat IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR ----------- ------- -------- -------- --------- -------- -------- -------- -------- -------- --------- -------- -------- -------- Ethernet0 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0 Ethernet4 U 12804864 N/A N/A 0 0 0 9 N/A N/A 0 0 0 Ethernet8 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0 Ethernet120 U 1 N/A N/A 0 0 0 11 N/A N/A 0 0 0 Ethernet124 U 1 N/A N/A 0 0 0 12363470 N/A N/A 0 429517 0 ``` **packet numbers in the output are formatted with commas:** ``` pfcstat Last cached time was 2021-08-02 10:35:32.725158 Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7 ----------- ------ ------ ------ ------ ------ ------ ------ ------ Ethernet120 0 0 0 0 0 0 0 0 Ethernet124 25,007 0 25,006 25,006 0 25,007 0 0 <-----DIFFERENT FORMAT AFTER COUNTER CLEAR COMMAND portstat Last cached time was 2021-08-02 10:35:47.829677 IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR ----------- ------- --------- ------------ --------- -------- -------- -------- --------- ----------- --------- -------- -------- -------- Ethernet0 X 0 0.00 B/s 0.00% 0 0 0 0 0.00 B/s 0.00% 0 0 0 Ethernet4 U 1,570,775 862.60 MB/s 69.01% 0 0 0 0 28.29 KB/s 0.00% 0 0 0 Ethernet120 U 0 0.00 B/s 0.00% 0 0 0 0 0.00 B/s 0.00% 0 0 0 Ethernet124 U 0 1406.45 KB/s 0.11% 0 0 0 1,488,765 817.56 MB/s 65.40% 0 83,040 0 <----DIFFERENT PRESENTATION FORMAT OF NUMBERS ``` #### How I did it Add a new function `format_number_with_comma` to format the packet numbers with comma, this function will be called in case `ns_diff` is not applicable. Update the unitest to cover this new change. #### How to verify it execute portstat and pfcstat to check the output whether the number format is expected. #### Previous command output (if the output of a command-line utility has changed) ``` pfcstat root@r-qa-sw-eth-2133:/home/admin# pfcstat Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7 ----------- ------ ------ ------ ------ ------ ------ ------ ------ Ethernet116 0 0 0 0 0 0 0 0 Ethernet120 0 0 0 0 0 0 0 0 Ethernet124 137407 0 45659 45660 0 45662 0 0 portstat IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR ----------- ------- -------- -------- --------- -------- -------- -------- -------- -------- --------- -------- -------- -------- Ethernet0 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0 Ethernet4 U 804864 N/A N/A 0 0 0 9 N/A N/A 0 0 0 Ethernet120 U 1 N/A N/A 0 0 0 11 N/A N/A 0 0 0 Ethernet124 U 1 N/A N/A 0 0 0 363470 N/A N/A 0 429517 0 ``` #### New command output (if the output of a command-line utility has changed) ``` pfcstat root@r-qa-sw-eth-2133:/home/admin# pfcstat Port Rx PFC0 PFC1 PFC2 PFC3 PFC4 PFC5 PFC6 PFC7 ----------- ------ ------ ------ ------ ------ ------ ------ ------ Ethernet116 0 0 0 0 0 0 0 0 Ethernet120 0 0 0 0 0 0 0 0 Ethernet124 137,407 0 45,659 45,660 0 45,662 0 0 portstat Last cached time was 2021-08-02 10:35:47.829677 IFACE STATE RX_OK RX_BPS RX_UTIL RX_ERR RX_DRP RX_OVR TX_OK TX_BPS TX_UTIL TX_ERR TX_DRP TX_OVR ----------- ------- -------- -------- --------- -------- -------- -------- -------- -------- --------- -------- -------- -------- Ethernet0 X 0 N/A N/A 0 0 0 0 N/A N/A 0 0 0 Ethernet4 U 804,864 N/A N/A 0 0 0 9 N/A N/A 0 0 0 Ethernet120 U 1 N/A N/A 0 0 0 11 N/A N/A 0 0 0 Ethernet124 U 1 N/A N/A 0 0 0 363,470 N/A N/A 0 429,517 0 ```
qiluo-msft
pushed a commit
that referenced
this pull request
Sep 3, 2021
…cases (#1795) #### What I did backport #1755 to 202012 branch #### How I did it Add a new function format_number_with_comma to format the packet numbers with comma, this function will be called in case ns_diff is not applicable. Update the unitest to cover this new change. #### How to verify it execute portstat and pfcstat to check the output whether the number format is expected.
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
Unify the packet number format in the output of "portstat" and "pfcstat" for all cases.
In some cases, the packet numbers in the output of these two commands are formatted with a comma, in some cases not.
This is because only when the numbers are treated by function
ns_diff, it will format the numbers with commas:return '{:,}'.format(max(0, new - old)), butns_diffis not called in all cases.for example, packet numbers in the output are NOT formatted with commas:
packet numbers in the output are formatted with commas:
How I did it
Add a new function
format_number_with_commato format the packet numbers with comma, this function will be called in casens_diffis not applicable.Update the unitest to cover this new change.
How to verify it
execute portstat and pfcstat to check the output whether the number format is expected.
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)