From 3d008eac8175fe684de24bfd71daf07a66dff14a Mon Sep 17 00:00:00 2001
From: Ying Xie <yxieca@users.noreply.github.com>
Date: Thu, 15 Aug 2019 13:24:08 -0700
Subject: [PATCH] [fast/warm reboot] kill radv docker before stopping BGP
 (#608)

* [fast/warm reboot] kill radv docker before stopping BGP

Kill radv docker before stopping BGP. Otherwise it will announce our
departure and cause hosts to lose default gateway.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* stop radv service after killing the docker to be ready for service auto restart.
---
 scripts/fast-reboot | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/fast-reboot b/scripts/fast-reboot
index c14b3c587feb..8b05650e5671 100755
--- a/scripts/fast-reboot
+++ b/scripts/fast-reboot
@@ -371,6 +371,11 @@ if [[ "$REBOOT_TYPE" = "warm-reboot" || "$REBOOT_TYPE" = "fastfast-reboot" ]]; t
     fi
 fi
 
+# Kill radv before stopping BGP service to prevent annoucing our departure.
+debug "Stopping radv ..."
+docker kill radv &>/dev/null || [ $? == 1 ]
+systemctl stop radv
+
 # Kill bgpd to start the bgp graceful restart procedure
 debug "Stopping bgp ..."
 docker exec -i bgp pkill -9 zebra