From: Mark Stapp Date: Tue, 4 Apr 2023 20:37:38 +0000 (-0400) Subject: zebra: fix race during shutdown X-Git-Tag: base_9.0~201^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=38a2e2cb263f323f44eef4824202278edc9ca775;p=matthieu%2Ffrr.git 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 --- 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 */