Skip to content

Commit 37f131e

Browse files
authored
Change fast-reboot script to use swss and radv service script (sonic-net#1036)
* Change fast-reboot script to use swss and radv service script for stopping services
1 parent a15b6bf commit 37f131e

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

scripts/fast-reboot

+4-7
Original file line numberDiff line numberDiff line change
@@ -503,9 +503,9 @@ systemctl stop nat
503503
debug "Stopped nat ..."
504504
505505
# Kill radv before stopping BGP service to prevent annoucing our departure.
506-
debug "Stopping radv ..."
507-
docker kill radv &>/dev/null || [ $? == 1 ]
506+
debug "Stopping radv service..."
508507
systemctl stop radv
508+
debug "Stopped radv service..."
509509
510510
# Kill bgpd to start the bgp graceful restart procedure
511511
debug "Stopping bgp ..."
@@ -536,12 +536,9 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
536536
debug "Stopped teamd ..."
537537
fi
538538
539-
# Kill swss Docker container
540-
# We call `docker kill swss` to ensure the container stops as quickly as possible,
541-
# then immediately call `systemctl stop swss` to prevent the service from
542-
# restarting the container automatically.
543-
docker kill swss &> /dev/null || debug "Docker swss is not running ($?) ..."
539+
debug "Stopping swss service ..."
544540
systemctl stop swss
541+
debug "Stopped swss service ..."
545542
546543
# Pre-shutdown syncd
547544
if [[ "$REBOOT_TYPE" = "warm-reboot" || "$REBOOT_TYPE" = "fastfast-reboot" ]]; then

0 commit comments

Comments
 (0)