Skip to content

[action] [PR:25016] Skip TUNNEL_DECAP conf during warm boot for marvell-teralynx#26171

Merged
mssonicbld merged 1 commit intosonic-net:202511from
mssonicbld:cherry/202511/25016
Mar 16, 2026
Merged

[action] [PR:25016] Skip TUNNEL_DECAP conf during warm boot for marvell-teralynx#26171
mssonicbld merged 1 commit intosonic-net:202511from
mssonicbld:cherry/202511/25016

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

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
  • Microsoft ADO (number only):

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

Signed-off-by: Sonic Build Admin [email protected]

A picture of a cute animal (not mandatory but encouraged)

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

<!--
     Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

     ** Make sure all your commits include a signature generated with `git commit -s` **

     If this is a bug fix, make sure your description includes "fixes #xxxx", or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

#### Which release branch to backport (provide reason below if selected)

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [x] 202505
- [x] 202511

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

Signed-off-by: Sonic Build Admin <[email protected]>

#### A picture of a cute animal (not mandatory but encouraged)
@mssonicbld
Copy link
Copy Markdown
Collaborator Author

Original PR: #25016

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld merged commit 4c79815 into sonic-net:202511 Mar 16, 2026
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant