From 63027a0ce3e9089f481d0d26fa4cd12fb209dcc8 Mon Sep 17 00:00:00 2001 From: Vaibhav Hemant Dixit Date: Fri, 7 Aug 2020 13:35:26 -0700 Subject: [PATCH 1/2] Change fast-reboot script to use swss and radv service script --- scripts/fast-reboot | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/fast-reboot b/scripts/fast-reboot index 27c22f2497..1052fed35d 100755 --- a/scripts/fast-reboot +++ b/scripts/fast-reboot @@ -503,8 +503,7 @@ 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 # Kill bgpd to start the bgp graceful restart procedure @@ -536,11 +535,7 @@ 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 # Pre-shutdown syncd From 2ef22a9865b3e8d0b5bb63f7f2e8c7b867b397cc Mon Sep 17 00:00:00 2001 From: Vaibhav Hemant Dixit Date: Fri, 14 Aug 2020 09:27:50 -0700 Subject: [PATCH 2/2] Added stopped debug events for swss and radv service --- scripts/fast-reboot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/fast-reboot b/scripts/fast-reboot index 1052fed35d..5bf1f193bc 100755 --- a/scripts/fast-reboot +++ b/scripts/fast-reboot @@ -505,6 +505,7 @@ debug "Stopped nat ..." # Kill radv before stopping BGP service to prevent annoucing our departure. debug "Stopping radv service..." systemctl stop radv +debug "Stopped radv service..." # Kill bgpd to start the bgp graceful restart procedure debug "Stopping bgp ..." @@ -537,6 +538,7 @@ fi debug "Stopping swss service ..." systemctl stop swss +debug "Stopped swss service ..." # Pre-shutdown syncd if [[ "$REBOOT_TYPE" = "warm-reboot" || "$REBOOT_TYPE" = "fastfast-reboot" ]]; then