From 37f131ef0403d5b811b3eccef161edaccb30bf6c Mon Sep 17 00:00:00 2001 From: Vaibhav Hemant Dixit Date: Fri, 14 Aug 2020 15:49:49 -0700 Subject: [PATCH] Change fast-reboot script to use swss and radv service script (#1036) * Change fast-reboot script to use swss and radv service script for stopping services --- scripts/fast-reboot | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/fast-reboot b/scripts/fast-reboot index 302cdf7f1f..6ed44c8dde 100755 --- a/scripts/fast-reboot +++ b/scripts/fast-reboot @@ -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 ..." @@ -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