proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 19:02:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldpd: use a timer instead of sleeping in LM init

Browse Source 
Stop sleeping if synchronous label-manager zapi session
has trouble during init: retry using a timer instead. Move
initial label-block request to a point where the LM zapi
session is known to be running. Remove the use of the
daemon 'instance' - we're using the session_id to distinguish
the LM zapi session.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-04-22 11:39:50 -04:00
parent 0f90b81558
commit 9d694b0b01
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ldpd/lde.c
View File

@ -56,7 +56,7 @@ static void lde_map_free(void *);
static int lde_address_add(struct lde_nbr *, struct lde_addr *); static int lde_address_add(struct lde_nbr *, struct lde_addr *);
static int lde_address_del(struct lde_nbr *, struct lde_addr *); static int lde_address_del(struct lde_nbr *, struct lde_addr *);
static void lde_address_list_free(struct lde_nbr *); static void lde_address_list_free(struct lde_nbr *);
static void zclient_sync_init(unsigned short instance); static void zclient_sync_init(void);
static void lde_label_list_init(void); static void lde_label_list_init(void);
static int lde_get_label_chunk(void); static int lde_get_label_chunk(void);
static void on_get_label_chunk_response(uint32_t start, uint32_t end); static void on_get_label_chunk_response(uint32_t start, uint32_t end);
@ -173,8 +173,7 @@ lde_init(struct ldpd_init *init)
/* Init synchronous zclient and label list */ /* Init synchronous zclient and label list */
frr_zclient_addr(&zclient_addr, &zclient_addr_len, frr_zclient_addr(&zclient_addr, &zclient_addr_len,
init->zclient_serv_path); init->zclient_serv_path);
zclient_sync_init(init->instance); zclient_sync_init();
lde_label_list_init();
} }
static void static void
@ -1746,37 +1745,67 @@ lde_address_list_free(struct lde_nbr *ln)
free(lde_addr); free(lde_addr);
} }
static void zclient_sync_init(unsigned short instance) /*
* Event callback used to retry the label-manager sync zapi session.
*/
static int zclient_sync_retry(struct thread *thread)
{
zclient_sync_init();
return 0;
}
/*
* Initialize and open a synchronous zapi session. This is used by label chunk
* management code, which acquires and releases blocks of labels from the
* zebra label-manager module.
*/
static void zclient_sync_init(void)
{ {
struct zclient_options options = zclient_options_default; struct zclient_options options = zclient_options_default;
options.synchronous = true; options.synchronous = true;
/* Initialize special zclient for synchronous message exchanges. */ /* Initialize special zclient for synchronous message exchanges. */
zclient_sync = zclient_new(master, &options); zclient_sync = zclient_new(master, &options);
zclient_sync->sock = -1; zclient_sync->sock = -1;
zclient_sync->redist_default = ZEBRA_ROUTE_LDP; zclient_sync->redist_default = ZEBRA_ROUTE_LDP;
zclient_sync->instance = instance;
zclient_sync->session_id = 1; /* Distinguish from main session */ zclient_sync->session_id = 1; /* Distinguish from main session */
zclient_sync->privs = &lde_privs; zclient_sync->privs = &lde_privs;
while (zclient_socket_connect(zclient_sync) < 0) { if (zclient_socket_connect(zclient_sync) < 0) {
log_warnx("Error connecting synchronous zclient!"); log_warnx("Error connecting synchronous zclient!");
sleep(1); goto retry;
} }
/* make socket non-blocking */ /* make socket non-blocking */
sock_set_nonblock(zclient_sync->sock); sock_set_nonblock(zclient_sync->sock);
/* Send hello to notify zebra this is a synchronous client */ /* Send hello to notify zebra this is a synchronous client */
while (zclient_send_hello(zclient_sync) < 0) { if (zclient_send_hello(zclient_sync) < 0) {
log_warnx("Error sending hello for synchronous zclient!"); log_warnx("Error sending hello for synchronous zclient!");
sleep(1); goto retry;
} }
/* Connect to label manager */ /* Connect to label manager */
while (lm_label_manager_connect(zclient_sync, 0) != 0) { if (lm_label_manager_connect(zclient_sync, 0) != 0) {
log_warnx("Error connecting to label manager!"); log_warnx("Error connecting to label manager!");
sleep(1); goto retry;
} }
/* Finish label-manager init once the LM session is running */
lde_label_list_init();
return;
retry:
/* Discard failed zclient object */
zclient_stop(zclient_sync);
zclient_free(zclient_sync);
zclient_sync = NULL;
/* Retry using a timer */
thread_add_timer(master, zclient_sync_retry, NULL, 1, NULL);
} }
static void static void

3
ldpd/ldpd.c
View File

@ -239,9 +239,6 @@ main(int argc, char *argv[])
" --ctl_socket Override ctl socket path\n" " --ctl_socket Override ctl socket path\n"
" -n, --instance Instance id\n"); " -n, --instance Instance id\n");
/* set default instance (to differentiate ldpd socket from lde one */
init.instance = 1;
while (1) { while (1) {
int opt; int opt;