[Nexthop] warmboot-finalizer: re-enable FLOW_CNT_TRAP after warm-boot reconcile - #28896
Closed
wren-nexthop wants to merge 1 commit into
Closed
[Nexthop] warmboot-finalizer: re-enable FLOW_CNT_TRAP after warm-boot reconcile#28896wren-nexthop wants to merge 1 commit into
wren-nexthop wants to merge 1 commit into
Conversation
Signed-off-by: domingo-nexthop <domingo@nexthop.ai>
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Collaborator
|
This PR has backport request for branch(es): 202512. ---Powered by SONiC BuildBot
|
Collaborator
|
This PR has backport request label(s) for branch(es): msft-202512, but is missing required test information. Please make sure you tick the tested branch(es) in the Tested branch section and provide test evidence (e.g., 202512: <test result>) in the Test result section as well in your PR description. ---Powered by SONiC BuildBot
|
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
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.
Why I did it
Resolves #28895
Pairs with sonic-utilities PR sonic-net/sonic-utilities#4756: with trap flow counters enabled, warm reboot crash-loops orchagent (Broadcom SAI fails the HOSTIF trap counter replay during APPLY_VIEW), so the warm-reboot script disables
FLOW_CNT_TRAPbefore the warm shutdown. Something then has to re-enable the group once reconcile completes, or trap flow counters silently stay off after every warm reboot.Work item tracking
How I did it
finalize-warmboot.shre-enablesFLEX_COUNTER_TABLE|FLOW_CNT_TRAPafter reconcile if — and only if — the reboot script left the marker/host/warmboot/flow_cnt_trap_need_re_enable, then removes the marker. The marker distinguishes "the reboot script disabled this on the user's behalf" from "the user had it disabled".How to verify it
FLOW_CNT_TRAPin CONFIG_DB,sudo warm-rebootwith the paired sonic-utilities change.FLEX_COUNTER_TABLE|FLOW_CNT_TRAPis back toenable, the marker is gone, andshow flowcnt-trap statsworks.Verified on Broadcom Tomahawk-based platforms together with the paired sonic-utilities change.
Which release branch to backport (provide reason below if selected)
Backport reason: required for warm reboot support on Broadcom Tomahawk platforms in 202512 (warm reboot fails with trap flow counters enabled without this fix + the paired sonic-utilities change).
Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO): #28895
Failure type: day-one issue
Tested branch