Delete routes only after we are committed to reboot

sonic-net · Sep 12, 2022 · b5f4629 · b5f4629
1 parent e1cc628
commit b5f4629
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/scripts/fast-reboot b/scripts/fast-reboot
@@ -631,7 +631,13 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
         unload_kernel
         exit "${EXIT_COUNTERPOLL_DELAY_FAILURE}"
     fi
+fi
+
+# We are fully committed to reboot from this point on because critical
+# service will go down and we cannot recover from it.
+set +e
 
+if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
     # Clear all routes except of default routes for faster reconciliation time.
     sonic-db-cli APPL_DB eval "
         for _, k in ipairs(redis.call('keys', '*')) do
@@ -642,10 +648,6 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
     " 0 > /dev/null
 fi
 
-# We are fully committed to reboot from this point on because critical
-# service will go down and we cannot recover from it.
-set +e
-
 # disable trap-handlers which were set before
 trap '' EXIT HUP INT QUIT TERM KILL ABRT ALRM