Merge pull request #4999 from mjstapp/fix_notif_installed_7_2

[7.2] zebra: dplane route updates need to check all nexthops
This commit is contained in:
Donald Sharp 2019-09-18 17:39:08 -04:00 committed by GitHub
commit 1f18affbf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1556,7 +1556,9 @@ static bool rib_update_re_from_ctx(struct route_entry *re,
changed_p = true;
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
break;
/* Keep checking nexthops */
continue;
}
if (CHECK_FLAG(ctx_nexthop->flags, NEXTHOP_FLAG_FIB)) {
@ -1992,6 +1994,9 @@ static void rib_process_dplane_notify(struct zebra_dplane_ctx *ctx)
* not-installed; or not-installed to installed.
*/
if (start_count > 0 && end_count > 0) {
if (debug_p)
zlog_debug("%u:%s applied nexthop changes from dplane notification",
dplane_ctx_get_vrf(ctx), dest_str);
/* Changed nexthops - update kernel/others */
dplane_route_notif_update(rn, re,