Align watermark flow with port configuration#2672
Merged
liat-grozovik merged 1 commit intosonic-net:202205from Feb 23, 2023
Merged
Conversation
Contributor
Author
|
/azpw run |
Collaborator
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
@stephenxs can you review this backport as well? just to be sure it is all aligned and i will assist with the merge. |
stephenxs
approved these changes
Feb 22, 2023
liat-grozovik
approved these changes
Feb 23, 2023
Collaborator
liat-grozovik
left a comment
liat-grozovik
left a comment
There was a problem hiding this comment.
following approval on master PR
dprital
added a commit
to dprital/sonic-buildimage
that referenced
this pull request
Feb 23, 2023
Update sonic-swss submodule pointer to include the following: * 3aeb4be Align watermark flow with port configuration ([sonic-net#2672](sonic-net/sonic-swss#2672)) Signed-off-by: dprital <drorp@nvidia.com>
8 tasks
liat-grozovik
pushed a commit
to sonic-net/sonic-buildimage
that referenced
this pull request
Feb 23, 2023
Update sonic-swss submodule pointer to include the following: * 3aeb4be Align watermark flow with port configuration ([#2672](sonic-net/sonic-swss#2672)) Signed-off-by: dprital <drorp@nvidia.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This PR fixes the following issue:
sonic-net/sonic-buildimage#11219
It's a cherry-pick (with conflicts resolution) for 202205 of the following PR:
#2525
What I did
Align watermark flow with port configuration
correct the queue, watermark and pg-drop counterpoll functionality according to cli commands
Why I did it
the flow before this commit was wrong, when watermark counterpoll was enabled, stats wasn't created in FLEX_COUNTERS_DB
and COUNTERS_DB unless enabling queue counterpoll as well.
in the same way when pg-drop counterpoll was enabled stats weren't added until watermark was enabled.
This is due to the wrong flow where queue and pg maps were generated only when queue or watermark (pg-watermark)
key was detected in flexcountersorch.cpp
How I verified it
manual testing
VS test (updated to reflect current flow) - before this commit only queue was tested
regression test
Details if related