matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: free LSP workqueue later during shutdown

Browse source 
Free the LSP workqueue later during shutdown, so that zebra
has enough time to clean up and uninstall any LSPs.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
This commit is contained in:
Mark Stapp 2021-11-12 15:10:00 -05:00
parent d9a03ad330
commit dd9538c5f3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zebra/main.c
View file

@ -182,8 +182,6 @@ static void sigint(void)
SET_FLAG(zvrf->flags, ZEBRA_VRF_RETAIN); SET_FLAG(zvrf->flags, ZEBRA_VRF_RETAIN);
} }
} }
if (zrouter.lsp_process_q)
work_queue_free_and_null(&zrouter.lsp_process_q);
vrf_terminate(); vrf_terminate();

3
zebra/zebra_router.c
View file

@ -235,6 +235,9 @@ void zebra_router_terminate(void)
RB_FOREACH_SAFE (zrt, zebra_router_table_head, &zrouter.tables, tmp) RB_FOREACH_SAFE (zrt, zebra_router_table_head, &zrouter.tables, tmp)
zebra_router_free_table(zrt); zebra_router_free_table(zrt);
if (zrouter.lsp_process_q)
work_queue_free_and_null(&zrouter.lsp_process_q);
work_queue_free_and_null(&zrouter.ribq); work_queue_free_and_null(&zrouter.ribq);
meta_queue_free(zrouter.mq); meta_queue_free(zrouter.mq);