some threads will still get vrf, when a new entry would created with insufficient...

diff --git a/zebra/main.c b/zebra/main.c
index c40a03551d501f39e7eefc794e2932f55a43b057..6fbbc0f772937d7fde1e69a5e5ed2cd96546e93f 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -175,11 +175,6 @@ static void sigint(void)
        if (zrouter.lsp_process_q)
                work_queue_free_and_null(&zrouter.lsp_process_q);
 
-       vrf_terminate();
-
-       ns_walk_func(zebra_ns_early_shutdown, NULL, NULL);
-       zebra_ns_notify_close();
-
        access_list_reset();
        prefix_list_reset();
        /*
@@ -207,6 +202,11 @@ void zebra_finalize(struct thread *dummy)
 {
        zlog_info("Zebra final shutdown");
 
+       vrf_terminate();
+
+       ns_walk_func(zebra_ns_early_shutdown, NULL, NULL);
+       zebra_ns_notify_close();
+
        /* Stop dplane thread and finish any cleanup */
        zebra_dplane_shutdown();