Skip to content

[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603#307

Merged
mssonicbld merged 2 commits into
Azure:202603from
mssonicbld:sonicbld/202603-merge
Apr 10, 2026
Merged

[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603#307
mssonicbld merged 2 commits into
Azure:202603from
mssonicbld:sonicbld/202603-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* b0cc77ff - (origin/202511) Enable express boot support for Marvell Teralynx platform (#4443) (2026-04-10) [mssonicbld]<br>```

mssonicbld and others added 2 commits April 10, 2026 09:13
<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

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

 If this is a bug fix, make sure your description includes "closes #xxxx",
 "fixes #xxxx" or "resolves #xxxx" so that GitHub automatically closes the related
 issue when the PR is merged.

 If you are adding/modifying/removing any command or utility script, please also
 make sure to add/modify/remove any unit tests from the tests
 directory as appropriate.

 If you are modifying or removing an existing 'show', 'config' or 'sonic-clear'
 subcommand, or you are adding a new subcommand, please make sure you also
 update the Command Line Reference Guide (doc/Command-Reference.md) to reflect
 your changes.

 Please provide the following information:
-->
Fixes #4406
#### What I did
Enable express boot support for Marvell Teralynx platform.
#### How I did it
Updated fast-reboot script (which is soft-linked to express-reboot script) to allow Marvell Teralynx platform for express boot.
#### How to verify it
Execute "express-reboot" command.
#### Previous command output (if the output of a command-line utility has changed)
```
root@sonic:/home/admin# show version

SONiC Software Version: SONiC.202511.77-dirty-20260224.183644
SONiC OS Version: 13
Distribution: Debian 13.3
Kernel: 6.12.41+deb13-sonic-amd64
Build commit: 1a2154e68
Build date: Tue Feb 24 19:15:37 UTC 2026
Built by: marvell@cpss-rdanda20-new

Platform: x86_64-wistron_sw_to3200k-r0
HwSKU: Wistron_sw_to3200k
ASIC: marvell-teralynx
ASIC Count: 1
Serial Number: N/A
Model Number: N/A
Hardware Revision: N/A
Uptime: 13:51:48 up 8:37, 1 user, load average: 2.03, 2.43, 2.45
Date: Sun 22 Mar 2026 13:51:48

root@sonic:/home/admin# express-reboot
eXpress Boot is not supported
root@sonic:/home/admin#
```
#### New command output (if the output of a command-line utility has changed)
```
root@sonic:/home/admin# express-reboot -v
Sun Mar 22 02:01:07 PM UTC 2026 Starting express-reboot
Sun Mar 22 02:01:11 PM UTC 2026 Checking for active PFC storms...
Sun Mar 22 02:01:11 PM UTC 2026 No active PFC storms detected. Safe to proceed with warm-reboot...
Sun Mar 22 02:01:13 PM UTC 2026 Loading kernel without secure boot
Sun Mar 22 02:01:14 PM UTC 2026 Starting lag_keepalive to send LACPDUs ...
Sun Mar 22 02:01:21 PM UTC 2026 Pausing orchagent ...
Sun Mar 22 02:01:22 PM UTC 2026 Collecting logs to check ssd health before express-reboot...
Sun Mar 22 02:01:22 PM UTC 2026 Stopping aaastatsd.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopped aaastatsd.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopping featured.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopped featured.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopping hostcfgd.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopped hostcfgd.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopping tacacs-config.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopped tacacs-config.timer ...
Sun Mar 22 02:01:22 PM UTC 2026 Stopping lldp ...
Sun Mar 22 02:01:24 PM UTC 2026 Stopped lldp
Sun Mar 22 02:01:24 PM UTC 2026 Stopping radv ...
Sun Mar 22 02:01:24 PM UTC 2026 Stopped radv
Sun Mar 22 02:01:24 PM UTC 2026 Stopping bgp ...
Sun Mar 22 02:01:35 PM UTC 2026 Stopped bgp
Sun Mar 22 02:01:35 PM UTC 2026 Stopping swss ...
Sun Mar 22 02:01:36 PM UTC 2026 Stopped swss
Sun Mar 22 02:01:36 PM UTC 2026 Initialize pre-shutdown ...
Sun Mar 22 02:01:36 PM UTC 2026 Requesting express boot pre-shutdown ...
Sun Mar 22 02:01:36 PM UTC 2026 Waiting for pre-shutdown ...
Sun Mar 22 02:01:36 PM UTC 2026 Pre-shutdown succeeded, state: pre-shutdown-succeeded ...
Sun Mar 22 02:01:36 PM UTC 2026 Stopping dash-ha ...
Sun Mar 22 02:01:36 PM UTC 2026 Stopped dash-ha
Sun Mar 22 02:01:36 PM UTC 2026 Stopping teamd ...
Sun Mar 22 02:01:36 PM UTC 2026 Stopped teamd
Sun Mar 22 02:01:36 PM UTC 2026 Stopping syncd ...
Sun Mar 22 02:01:43 PM UTC 2026 Stopped syncd
Sun Mar 22 02:01:43 PM UTC 2026 Backing up database ...
Successfully copied 99.3kB to /host/warmboot
Sun Mar 22 02:01:49 PM UTC 2026 Enabling Watchdog before express-reboot
Sun Mar 22 02:01:50 PM UTC 2026 Rebooting with /sbin/kexec -e to SONiC-OS-202511.77-dirty-20260224.183644 ...
0

root@sonic:/home/admin# show reboot-cause
User issued 'express-reboot' command [User: root, Time: Sun Mar 22 02:04:38 PM UTC 2026]

root@sonic:/home/admin# show warm state
name restore_count state
------------- --------------- -----------------------
gearsyncd 1
coppmgrd 1
teamsyncd 1 reconciled
fdbsyncd 1 reconciled
syncd 1
intfmgrd 1 reconciled
teammgrd 1
vxlanmgrd 1 reconciled
portsyncd 1
rebootbackend 0
vrrpsyncd 1 reconciled
orchagent 1 reconciled
vrfmgrd 1 reconciled
tunnelmgrd 1 reconciled
vlanmgrd 1 reconciled
nbrmgrd 1
warm-shutdown 0 warm-shutdown-succeeded
neighsyncd 1 reconciled
bgp 1 reconciled

root@sonic:/home/admin# docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
1dbe05c1bc28 docker-snmp:latest "/usr/bin/docker-snm…" 11 days ago Up 19 minutes snmp
251bbf5ea0fe docker-platform-monitor:latest "/usr/bin/docker_ini…" 11 days ago Up 19 minutes pmon
5aa6fb90c2c0 docker-sonic-mgmt-framework:latest "/usr/local/bin/supe…" 11 days ago Up 19 minutes mgmt-framework
0297eb7d4a29 docker-lldp:latest "/usr/bin/docker-lld…" 11 days ago Up 19 minutes lldp
4518a126f278 docker-sonic-gnmi:latest "/usr/local/bin/supe…" 11 days ago Up 19 minutes gnmi
bdc58b171baf docker-eventd:latest "/usr/local/bin/supe…" 11 days ago Up 24 minutes eventd
16f2c5ac43e8 docker-router-advertiser:latest "/usr/bin/docker-ini…" 11 days ago Up 24 minutes radv
fad1c32aaa02 docker-syncd-mrvl-teralynx-rpc:latest "/usr/local/bin/supe…" 11 days ago Up 24 minutes syncd
d8c982fefad6 docker-teamd:latest "/usr/local/bin/supe…" 11 days ago Up 24 minutes teamd
22e97f1a5b45 docker-sysmgr:latest "/usr/local/bin/supe…" 11 days ago Up 24 minutes sysmgr
709a51254b33 docker-orchagent:latest "/usr/bin/docker-ini…" 11 days ago Up 24 minutes swss
7f18cb72c949 docker-database:latest "/usr/local/bin/dock…" 11 days ago Up 24 minutes database

root@sonic:/home/admin# date
Sun Mar 22 02:26:58 PM UTC 2026

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
@mssonicbld mssonicbld merged commit d66d19e into Azure:202603 Apr 10, 2026
3 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