align watermark flow with port configuration #2525
Conversation
|
This pull request introduces 1 alert when merging 50281fb into 28aa309 - view on LGTM.com new alerts:
Heads-up: LGTM.com's PR analysis will be disabled on the 5th of December, and LGTM.com will be shut down ⏻ completely on the 16th of December 2022. Please enable GitHub code scanning, which uses the same CodeQL engine ⚙️ that powers LGTM.com. For more information, please check out our post on the GitHub blog. |
dbarashinvd
force-pushed
the
dbarashi_align_watermark
branch
from
50281fb to
98674ad
Compare
|
@marian-pritsak could you please help to review and approve? |
This is the verification test |
*Align watermark flow with port configuration correct the queue, watermark and pg-drop counterpoll functionality according to cli commands
*Align watermark flow with port configuration correct the queue, watermark and pg-drop counterpoll functionality according to cli commands
StormLiangMS
added
Included in 202211 Branch
and removed
Approved for 202211 Branch
labels
Update sonic-swss submodule pointer to include the following: * 782a2ef Align watermark flow with port configuration ([sonic-net#2525](sonic-net/sonic-swss#2525)) * dca78d8 [Fdbsyncd] Bug Fix for remote MAC move to local MAC and Fix for Static MAC advertisement in EVPN. ([sonic-net#2521](sonic-net/sonic-swss#2521)) * 28aa309 [fpm] Fix FpmLink to read all netlink messages from FPM message ([sonic-net#2492](sonic-net/sonic-swss#2492)) Signed-off-by: dprital <drorp@nvidia.com>
Update sonic-swss submodule pointer to include the following: * 782a2ef Align watermark flow with port configuration ([#2525](sonic-net/sonic-swss#2525)) * dca78d8 [Fdbsyncd] Bug Fix for remote MAC move to local MAC and Fix for Static MAC advertisement in EVPN. ([#2521](sonic-net/sonic-swss#2521)) * 28aa309 [fpm] Fix FpmLink to read all netlink messages from FPM message ([#2492](sonic-net/sonic-swss#2492)) Signed-off-by: dprital <drorp@nvidia.com>
|
should this be cherry-picked to 202205 too, as the issue was in 202111? |
|
yes Rita we're working on cherry picking it with conflicts for 202205 |
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
|
requesting for 202205 as sonic-net/sonic-buildimage#11219 is intended for 202205 and 202211 |
|
@dbarashinvd please open separate PR for 202205 branch. |
@yxieca FYI. #2672 has been created for 202205 backporting. It has been merged. |
This PR fixes the following issue:
sonic-net/sonic-buildimage#11219
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