]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: fix race during shutdown 13213/head
authorMark Stapp <mjs@labn.net>
Tue, 4 Apr 2023 20:37:38 +0000 (16:37 -0400)
committerMark Stapp <mjs@labn.net>
Tue, 4 Apr 2023 20:37:38 +0000 (16:37 -0400)
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>
zebra/zebra_dplane.c

index fb1ebc682737d76fcf7e0a27006ebc9b95c69409..f9253ebf76cb6d7d9e3ac16a470008fa65291bd0 100644 (file)
@@ -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 */