diff options
| author | Mark Stapp <mjs.ietf@gmail.com> | 2023-06-27 08:54:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 08:54:46 -0400 |
| commit | d8f0a8eb471c5537f616266514e75f196923881b (patch) | |
| tree | 1d2a7b0f1bca1346e8dde5bdede5206e65dad9c1 /bgpd/bgp_zebra.c | |
| parent | 53785cdd4390996f794d7d712f8431feecd3467d (diff) | |
| parent | edf6d1917c0422e44e0383dc0e0da55b484c86fa (diff) | |
Merge pull request #13851 from opensourcerouting/fix/use_zclient_sync_for_table_manager
bgpd: Use synchronous Zebra client for table manager
Diffstat (limited to 'bgpd/bgp_zebra.c')
| -rw-r--r-- | bgpd/bgp_zebra.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 4b2b31fd7b..e6fa94733f 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -1075,11 +1075,14 @@ static void bgp_zebra_tm_connect(struct event *t) ret = tm_table_manager_connect(zclient); } if (ret < 0) { - zlog_info("Error connecting to table manager!"); + zlog_err("Error connecting to table manager!"); bgp_tm_status_connected = false; } else { - if (!bgp_tm_status_connected) - zlog_debug("Connecting to table manager. Success"); + if (!bgp_tm_status_connected) { + if (BGP_DEBUG(zebra, ZEBRA)) + zlog_debug( + "Connecting to table manager. Success"); + } bgp_tm_status_connected = true; if (!bgp_tm_chunk_obtained) { if (bgp_zebra_get_table_range(bgp_tm_chunk_size, @@ -1122,7 +1125,7 @@ void bgp_zebra_init_tm_connect(struct bgp *bgp) bgp_tm_min = bgp_tm_max = 0; bgp_tm_chunk_size = BGP_FLOWSPEC_TABLE_CHUNK; bgp_tm_bgp = bgp; - event_add_timer(bm->master, bgp_zebra_tm_connect, zclient, delay, + event_add_timer(bm->master, bgp_zebra_tm_connect, zclient_sync, delay, &bgp_tm_thread_connect); } |