bgpd: Arrange peer notification to after zebra announce

Currently BGP attempts to send route change information
to it's peers *before* the route is installed into zebra.
This creates a bug in suppress-fib-pending in the following
scenario:

a) bgp suppress-fib-pending and bgp has a route with
2 way ecmp.
b) bgp receives a route withdraw from peer 1.  BGP
will send the route to zebra and mark the route as
FIB_INSTALL_PENDING.
c) bgp receives a route withdraw from peer 2.  BGP
will see the route has the FIB_INSTALL_PENDING and
not send the withdrawal of the route to the peer.
bgp will then send the route deletion to zebra and
clean up the bgp_path_info's.

At this point BGP is stuck where it has not sent
a route withdrawal to downstream peers.

Let's modify the code in bgp_process_main_one to
send the route notification to zebra first before
attempting to announce the route.  The route withdrawal
will remove the FIB_INSTALL_PENDING flag from the dest
and this will allow group_announce_route to believe
it can send the route withdrawal.

For the master branch this is ok because the recent
backpressure commits are in place and nothing is going
to change from an ordering perspective in that regards.
Ostensibly this fix is also for operators of Sonic and
will be backported to the 8.5 branch as well.  This will
change the order of the send to peers to be after the
zebra installation but sonic users are using suppress-fib-pending
anyways so updates won't go out until rib ack has been
received anyways.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 329d5a5cbba23ec740b6ee3e223be5b13a631eb8)

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 7ac14f593e8cf49ac9a8734538e6d7c23f0b5acb..3c3f3498d8ba72ae94ff07081ff26e8087d0f976 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -3465,14 +3465,6 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest,
        }
 #endif
 
-       group_announce_route(bgp, afi, safi, dest, new_select);
-
-       /* unicast routes must also be annouced to labeled-unicast update-groups
-        */
-       if (safi == SAFI_UNICAST)
-               group_announce_route(bgp, afi, SAFI_LABELED_UNICAST, dest,
-                                    new_select);
-
        /* FIB update. */
        if (bgp_fibupd_safi(safi) && (bgp->inst_type != BGP_INSTANCE_TYPE_VIEW)
            && !bgp_option_check(BGP_OPT_NO_FIB)) {
@@ -3502,6 +3494,15 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest,
                }
        }
 
+       group_announce_route(bgp, afi, safi, dest, new_select);
+
+       /* unicast routes must also be annouced to labeled-unicast update-groups
+        */
+       if (safi == SAFI_UNICAST)
+               group_announce_route(bgp, afi, SAFI_LABELED_UNICAST, dest,
+                                    new_select);
+
+
        bgp_process_evpn_route_injection(bgp, afi, safi, dest, new_select,
                                         old_select);