Skip to content

Commit

Permalink
Change fast-reboot script to use swss and radv service script (sonic-…
Browse files Browse the repository at this point in the history
…net#1036)

* Change fast-reboot script to use swss and radv service script for stopping services
  • Loading branch information
vaibhavhd authored Aug 14, 2020
1 parent a15b6bf commit 37f131e
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions scripts/fast-reboot
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,9 @@ systemctl stop nat
debug "Stopped nat ..."
# Kill radv before stopping BGP service to prevent annoucing our departure.
debug "Stopping radv ..."
docker kill radv &>/dev/null || [ $? == 1 ]
debug "Stopping radv service..."
systemctl stop radv
debug "Stopped radv service..."
# Kill bgpd to start the bgp graceful restart procedure
debug "Stopping bgp ..."
Expand Down Expand Up @@ -536,12 +536,9 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
debug "Stopped teamd ..."
fi
# Kill swss Docker container
# We call `docker kill swss` to ensure the container stops as quickly as possible,
# then immediately call `systemctl stop swss` to prevent the service from
# restarting the container automatically.
docker kill swss &> /dev/null || debug "Docker swss is not running ($?) ..."
debug "Stopping swss service ..."
systemctl stop swss
debug "Stopped swss service ..."
# Pre-shutdown syncd
if [[ "$REBOOT_TYPE" = "warm-reboot" || "$REBOOT_TYPE" = "fastfast-reboot" ]]; then
Expand Down

0 comments on commit 37f131e

Please sign in to comment.