summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Stapp <mjs@labn.net>2023-04-04 16:37:38 -0400
committerMark Stapp <mjs@labn.net>2023-04-04 16:37:38 -0400
commit38a2e2cb263f323f44eef4824202278edc9ca775 (patch)
tree2d48c906468150938b4559074c77d53ef3dca302
parent117bc6ba2b82c71de35934fdc317cd36bdea233e (diff)
zebra: fix race during shutdown
During shutdown, the main pthread stops the dplane pthread before exiting. Don't try to clean up any events scheduled to the dplane pthread at that point - just let the thread exit and clean up. Signed-off-by: Mark Stapp <mjs@labn.net>
-rw-r--r--zebra/zebra_dplane.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index fb1ebc6827..f9253ebf76 100644
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -6853,10 +6853,6 @@ void zebra_dplane_shutdown(void)
zdplane_info.dg_run = false;
- if (zdplane_info.dg_t_update)
- event_cancel_async(zdplane_info.dg_t_update->master,
- &zdplane_info.dg_t_update, NULL);
-
frr_pthread_stop(zdplane_info.dg_pthread, NULL);
/* Destroy pthread */