Merge pull request FRRouting#17975 from FRRouting/mergify/bp/stable/1…

…0.2/pr-17971 bgpd: With suppress-fib-pending ensure withdrawal is sent (backport FRRouting#17971)
cscarpitta · Feb 2, 2025 · 7180a94 · 7180a94
2 parents 05f9d44 + 876f6e2
commit 7180a94
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -3827,6 +3827,12 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest,
 					 BGP_PATH_ATTR_CHANGED);
 		UNSET_FLAG(new_select->flags, BGP_PATH_MULTIPATH_CHG);
 		UNSET_FLAG(new_select->flags, BGP_PATH_LINK_BW_CHG);
+	} else {
+		/*
+		 * Ensure that on uninstall that the INSTALL_PENDING
+		 * is no longer set
+		 */
+		UNSET_FLAG(dest->flags, BGP_NODE_FIB_INSTALL_PENDING);
 	}
 
 	/* call bmp hook for loc-rib route update / withdraw after flags were