Skip TUNNEL_DECAP conf during warm boot for marvell-teralynx#25016
Merged
lihuay merged 4 commits intosonic-net:masterfrom Feb 24, 2026
Merged
Skip TUNNEL_DECAP conf during warm boot for marvell-teralynx#25016lihuay merged 4 commits intosonic-net:masterfrom
lihuay merged 4 commits intosonic-net:masterfrom
Conversation
Summary: During SWSS warm restart, the script swssconfig.sh replays only the TUNNEL_DECAP_TABLE subset from ipinip.json. This replay must not run on platforms that already recover IPinIP decap state from APP_DB. The current logic skipped replay only for Broadcom platform. This patch extends the skip behavior to marvell-teralynx ASICs. Type of change: Bug Fix - Adapting skipping of TUNNEL_DECAP replay in case of marvell-teralynx ASIC How did you do it? Updated warm-boot logic to skip applying ipinip.json for: marvell-teralynx similar to broadcom Apply the filtered subset for all other ASICs. This prevents duplicate tunnel-decap create operations during warm restart on Teralynx platforms. How did you verify/test it? Verified the behavior on Marvell-teralynx platform. Any platform specific information? YES, marvell-teralynx Signed-off-by: Gnanapriya Sethuramarajan <[email protected]>
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug in the warm boot logic for the marvell-teralynx ASIC platform. During SWSS warm restart, the system was incorrectly replaying the TUNNEL_DECAP_TABLE configuration from ipinip.json, causing duplicate tunnel-decap create operations. The fix extends the existing skip behavior (already implemented for Broadcom) to also cover marvell-teralynx ASICs, which similarly recover IPinIP decap state from APP_DB during warm boot.
Changes:
- Modified warm boot conditional logic in swssconfig.sh to skip TUNNEL_DECAP replay for marvell-teralynx ASICs (in addition to existing broadcom skip)
- Inverted the condition from checking != "broadcom" to checking == "broadcom" || == "marvell-teralynx" for better clarity
- Updated echo messages to be more informative by including the actual ASIC type in the output
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
lihuay
approved these changes
Feb 19, 2026
|
Azure Pipelines successfully started running 1 pipeline(s). |
FengPan-Frank
pushed a commit
to FengPan-Frank/sonic-buildimage
that referenced
this pull request
Mar 6, 2026
…et#25016) Summary: During SWSS warm restart, the script swssconfig.sh replays only the TUNNEL_DECAP_TABLE subset from ipinip.json. This replay must not run on platforms that already recover IPinIP decap state from APP_DB. The current logic skipped replay only for Broadcom platform. This patch extends the skip behavior to marvell-teralynx ASICs. Type of change: Bug Fix - Adapting skipping of TUNNEL_DECAP replay in case of marvell-teralynx ASIC How did you do it? Updated warm-boot logic to skip applying ipinip.json for: marvell-teralynx similar to broadcom Apply the filtered subset for all other ASICs. This prevents duplicate tunnel-decap create operations during warm restart on Teralynx platforms. How did you verify/test it? Verified the behavior on Marvell-teralynx platform. Any platform specific information? YES, marvell-teralynx Signed-off-by: Gnanapriya Sethuramarajan <[email protected]> Co-authored-by: Lihua Yuan <[email protected]> Signed-off-by: Feng Pan <[email protected]>
8 tasks
Collaborator
|
Cherry-pick PR to 202511: #26171 |
mssonicbld
added
Included in 202511 Branch
and removed
Created PR to 202511 Branch
labels
dprital
pushed a commit
that referenced
this pull request
Mar 19, 2026
Summary: During SWSS warm restart, the script swssconfig.sh replays only the TUNNEL_DECAP_TABLE subset from ipinip.json. This replay must not run on platforms that already recover IPinIP decap state from APP_DB. The current logic skipped replay only for Broadcom platform. This patch extends the skip behavior to marvell-teralynx ASICs. Type of change: Bug Fix - Adapting skipping of TUNNEL_DECAP replay in case of marvell-teralynx ASIC How did you do it? Updated warm-boot logic to skip applying ipinip.json for: marvell-teralynx similar to broadcom Apply the filtered subset for all other ASICs. This prevents duplicate tunnel-decap create operations during warm restart on Teralynx platforms. How did you verify/test it? Verified the behavior on Marvell-teralynx platform. Any platform specific information? YES, marvell-teralynx Signed-off-by: Gnanapriya Sethuramarajan <[email protected]> Co-authored-by: Lihua Yuan <[email protected]> Signed-off-by: dprital <[email protected]>
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.
Summary:
During SWSS warm restart, the script swssconfig.sh replays only the TUNNEL_DECAP_TABLE subset from ipinip.json. This replay must not run on platforms that already recover IPinIP decap state from APP_DB. The current logic skipped replay only for Broadcom platform. This patch extends the skip behavior to marvell-teralynx ASICs.
Type of change:
Bug Fix - Adapting skipping of TUNNEL_DECAP replay in case of marvell-teralynx ASIC
How did you do it?
Updated warm-boot logic to skip applying ipinip.json for: marvell-teralynx similar to broadcom Apply the filtered subset for all other ASICs.
This prevents duplicate tunnel-decap create operations during warm restart on Teralynx platforms.
How did you verify/test it?
Verified the behavior on Marvell-teralynx platform.
Any platform specific information?
YES, marvell-teralynx
Why I did it
Work item tracking
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)