proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 11:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15891 from mjstapp/retry_pathd_sync_conn

Browse Source 
pathd: retry label-manager connection asynchronously
This commit is contained in:
Donatas Abraitis 2024-05-02 11:18:10 +03:00 committed by GitHub
commit b469ebc703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pathd/path_main.c
View File

@ -58,7 +58,7 @@ static void sighup(void)
static void sigint(void) static void sigint(void)
{ {
zlog_notice("Terminating on signal"); zlog_notice("Terminating on signal");
zlog_notice("Unregisterfrom opaque,etc "); zlog_notice("Unregister from opaque,etc ");
pathd_shutdown(); pathd_shutdown();
exit(0); exit(0);

59
pathd/path_zebra.c
View File

@ -29,6 +29,17 @@ static int path_zebra_opaque_msg_handler(ZAPI_CALLBACK_ARGS);
struct zclient *zclient; struct zclient *zclient;
static struct zclient *zclient_sync; static struct zclient *zclient_sync;
/* Event to retry synch zapi setup for label-manager */
static struct event *t_sync_connect;
enum path_sync_level {
PATH_SYNC_NONE = 0,
PATH_SYNC_CONN,
PATH_SYNC_HELLO,
PATH_SYNC_DONE
};
static enum path_sync_level path_sync_client_level;
/* Global Variables */ /* Global Variables */
bool g_has_router_id_v4 = false; bool g_has_router_id_v4 = false;
bool g_has_router_id_v6 = false; bool g_has_router_id_v6 = false;
@ -236,26 +247,48 @@ void path_zebra_release_label(mpls_label_t label)
zlog_warn("%s: error releasing label range!", __func__); zlog_warn("%s: error releasing label range!", __func__);
} }
static void path_zebra_label_manager_connect(void) /*
* Initialize and connect the synchronous zclient session for the
* label-manager. This is prepared to retry on error.
*/
static void path_zebra_label_manager_connect(struct event *event)
{ {
if (path_sync_client_level == PATH_SYNC_NONE) {
/* Connect to label manager. */ /* Connect to label manager. */
while (zclient_socket_connect(zclient_sync) < 0) { if (zclient_socket_connect(zclient_sync) < 0) {
zlog_warn("%s: error connecting synchronous zclient!", zlog_warn("%s: error connecting synchronous zclient!",
__func__); __func__);
sleep(1); event_add_timer(master, path_zebra_label_manager_connect,
NULL, 1, &t_sync_connect);
return;
} }
set_nonblocking(zclient_sync->sock); set_nonblocking(zclient_sync->sock);
/* Send hello to notify zebra this is a synchronous client */ path_sync_client_level = PATH_SYNC_CONN;
while (zclient_send_hello(zclient_sync) < 0) {
zlog_warn("%s: Error sending hello for synchronous zclient!",
__func__);
sleep(1);
} }
while (lm_label_manager_connect(zclient_sync, 0) != 0) { /* Send hello to notify zebra this is a synchronous client */
zlog_warn("%s: error connecting to label manager!", __func__); if (path_sync_client_level == PATH_SYNC_CONN) {
sleep(1); if (zclient_send_hello(zclient_sync) == ZCLIENT_SEND_FAILURE) {
zlog_warn("%s: Error sending hello for synchronous zclient!",
__func__);
event_add_timer(master, path_zebra_label_manager_connect,
NULL, 1, &t_sync_connect);
return;
}
path_sync_client_level = PATH_SYNC_HELLO;
}
if (path_sync_client_level == PATH_SYNC_HELLO) {
if (lm_label_manager_connect(zclient_sync, 0) != 0) {
zlog_warn("%s: error connecting to label manager!",
__func__);
event_add_timer(master, path_zebra_label_manager_connect,
NULL, 1, &t_sync_connect);
return;
}
path_sync_client_level = PATH_SYNC_DONE;
} }
} }
@ -334,13 +367,15 @@ void path_zebra_init(struct event_loop *master)
zclient_sync->privs = &pathd_privs; zclient_sync->privs = &pathd_privs;
/* Connect to the LM. */ /* Connect to the LM. */
path_zebra_label_manager_connect(); t_sync_connect = NULL;
path_zebra_label_manager_connect(NULL);
} }
void path_zebra_stop(void) void path_zebra_stop(void)
{ {
zclient_stop(zclient); zclient_stop(zclient);
zclient_free(zclient); zclient_free(zclient);
event_cancel(&t_sync_connect);
zclient_stop(zclient_sync); zclient_stop(zclient_sync);
zclient_free(zclient_sync); zclient_free(zclient_sync);
} }