From 52dde8747b484cd00120cd9d9d9128c6ece1d943 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 19 Jun 2023 18:35:52 +0300 Subject: [PATCH] zebra: Ignore non GR-aware zclient handling for BGP This is for synchronous client (label/table manager) - aka session_id == 1. Signed-off-by: Donatas Abraitis --- zebra/zserv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/zebra/zserv.c b/zebra/zserv.c index 3170da5193fa..85e1edeca069 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -587,6 +587,13 @@ static void zserv_client_free(struct zserv *client) close(client->sock); + /* If this is a synchronous BGP Zebra client for label/table + * manager, then ignore it. It's not GR-aware, and causes GR to + * be skipped for the session_id == 0 (asynchronous). + */ + if (client->proto == ZEBRA_ROUTE_BGP && client->session_id == 1) + return; + if (DYNAMIC_CLIENT_GR_DISABLED(client)) { zebra_mpls_client_cleanup_vrf_label(client->proto);