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. This is the 8.5 version.

Signed-off-by: Mark Stapp <mjs@labn.net>

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index ef4cef65ca55c59bd0da228add6c623c4f7962db..6341358afaf58c3c4f6d0832a3a01e68c03f5099 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -6866,10 +6866,6 @@ void zebra_dplane_shutdown(void)
 
        zdplane_info.dg_run = false;
 
-       if (zdplane_info.dg_t_update)
-               thread_cancel_async(zdplane_info.dg_t_update->master,
-                                   &zdplane_info.dg_t_update, NULL);
-
        frr_pthread_stop(zdplane_info.dg_pthread, NULL);
 
        /* Destroy pthread */