zebra: only perform shutdown signal processing once

[mirror_frr.git] / zebra / main.c

diff --git a/zebra/main.c b/zebra/main.c
index 4eeba8549aa13c8c67a69e8c3536a27fee9748f6..253b3087fbf8a88899d62e2070ce0abb6ec2b21d 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -39,6 +39,7 @@
 #include "routemap.h"
 #include "frr_pthread.h"
 
+#include "zebra/zebra_errors.h"
 #include "zebra/rib.h"
 #include "zebra/zserv.h"
 #include "zebra/debug.h"
@@ -98,6 +99,7 @@ struct option longopts[] = {
        {"ecmp", required_argument, NULL, 'e'},
        {"label_socket", no_argument, NULL, 'l'},
        {"retain", no_argument, NULL, 'r'},
+       {"vrfdefaultname", required_argument, NULL, 'o'},
 #ifdef HAVE_NETLINK
        {"vrfwnetns", no_argument, NULL, 'n'},
        {"nl-bufsize", required_argument, NULL, 's'},
@@ -140,11 +142,19 @@ static void sigint(void)
        struct zebra_vrf *zvrf;
        struct listnode *ln, *nn;
        struct zserv *client;
+       static bool sigint_done;
+
+       if (sigint_done)
+               return;
+
+       sigint_done = true;
 
        zlog_notice("Terminating on signal");
 
        frr_early_fini();
 
+       zebra_dplane_pre_finish();
+
        for (ALL_LIST_ELEMENTS(zebrad.client_list, ln, nn, client))
                zserv_close_client(client);
 
@@ -168,7 +178,26 @@ static void sigint(void)
        prefix_list_reset();
        route_map_finish();
 
-       list_delete_and_null(&zebrad.client_list);
+       list_delete(&zebrad.client_list);
+
+       /* Indicate that all new dplane work has been enqueued. When that
+        * work is complete, the dataplane will enqueue an event
+        * with the 'finalize' function.
+        */
+       zebra_dplane_finish();
+}
+
+/*
+ * Final shutdown step for the zebra main thread. This is run after all
+ * async update processing has completed.
+ */
+int zebra_finalize(struct thread *dummy)
+{
+       zlog_info("Zebra final shutdown");
+
+       /* Stop dplane thread and finish any cleanup */
+       zebra_dplane_shutdown();
+
        work_queue_free_and_null(&zebrad.ribq);
        meta_queue_free(zebrad.mq);
 
@@ -234,7 +263,7 @@ int main(int argc, char **argv)
        frr_preinit(&zebra_di, argc, argv);
 
        frr_opt_add(
-               "bakz:e:l:r"
+               "bakz:e:l:o:r"
 #ifdef HAVE_NETLINK
                "s:n"
 #endif
@@ -253,6 +282,7 @@ int main(int argc, char **argv)
                "  -l, --label_socket    Socket to external label manager\n"
                "  -k, --keep_kernel     Don't delete old routes which were installed by zebra.\n"
                "  -r, --retain          When program terminates, retain added route by zebra.\n"
+               "  -o, --vrfdefaultname  Set default VRF name.\n"
 #ifdef HAVE_NETLINK
                "  -n, --vrfwnetns       Use NetNS as VRF backend\n"
                "  -s, --nl-bufsize      Set netlink receive buffer size\n"
@@ -288,12 +318,16 @@ int main(int argc, char **argv)
                        multipath_num = atoi(optarg);
                        if (multipath_num > MULTIPATH_NUM
                            || multipath_num <= 0) {
-                               zlog_err(
+                               flog_err(
+                                       EC_ZEBRA_BAD_MULTIPATH_NUM,
                                        "Multipath Number specified must be less than %d and greater than 0",
                                        MULTIPATH_NUM);
                                return 1;
                        }
                        break;
+               case 'o':
+                       vrf_set_default_name(optarg);
+                       break;
                case 'z':
                        zserv_path = optarg;
                        if (!frr_zclient_addr(&dummy, &dummylen, optarg)) {
@@ -412,6 +446,9 @@ int main(int argc, char **argv)
        /* RNH init */
        zebra_rnh_init();
 
+       /* Error init */
+       zebra_error_init();
+
 #if defined(HANDLE_ZAPI_FUZZING)
        if (zapi_fuzzing) {
                zserv_read_file(zapi_fuzzing);