Merge pull request #6117 from qlyoung/fix-grpc-plugin-with-daemonize

lib: defer grpc plugin initialization to post fork

1 files changed, 16 insertions, 5 deletions

diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp
index 089899368d..b195f1aeca 100644
--- a/lib/northbound_grpc.cpp
+++ b/lib/northbound_grpc.cpp
@@ -884,7 +884,14 @@ static int frr_grpc_finish(void)
 	return 0;
 }
 
-static int frr_grpc_module_late_init(struct thread_master *tm)
+/*
+ * This is done this way because module_init and module_late_init are both
+ * called during daemon pre-fork initialization. Because the GRPC library
+ * spawns threads internally, we need to delay initializing it until after
+ * fork. This is done by scheduling this init function as an event task, since
+ * the event loop doesn't run until after fork.
+ */
+static int frr_grpc_module_very_late_init(struct thread *thread)
 {
 	static unsigned long port = GRPC_DEFAULT_PORT;
 	const char *args = THIS_MODULE->load_args;
@@ -910,15 +917,19 @@ static int frr_grpc_module_late_init(struct thread_master *tm)
 	if (frr_grpc_init(&port) < 0)
 		goto error;
 
-	hook_register(frr_fini, frr_grpc_finish);
-
-	return 0;
-
 error:
 	flog_err(EC_LIB_GRPC_INIT, "failed to initialize the gRPC module");
 	return -1;
 }
 
+static int frr_grpc_module_late_init(struct thread_master *tm)
+{
+	thread_add_event(tm, frr_grpc_module_very_late_init, NULL, 0, NULL);
+	hook_register(frr_fini, frr_grpc_finish);
+
+	return 0;
+}
+
 static int frr_grpc_module_init(void)
 {
 	hook_register(frr_late_init, frr_grpc_module_late_init);