Fix deadlock in standalone mcrouter on invalid config

facebook · Dec 10, 2024 · 4904ec5 · 4904ec5
1 parent b2aaff7
commit 4904ec5
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/mcrouter/Server-inl.h b/mcrouter/Server-inl.h
@@ -310,11 +310,6 @@ bool runServerDual(
     auto evbs = extractEvbs(*ioThreadPool);
     CHECK_EQ(evbs.size(), mcrouterOpts.num_proxies);
 
-    // Create AsyncMcServer instance
-    asyncMcServer =
-        std::make_shared<AsyncMcServer>(detail::createAsyncMcServerOptions(
-            mcrouterOpts, standaloneOpts, &evbs));
-
     // Create CarbonRouterInstance
     if (standaloneOpts.remote_thread) {
       router =
@@ -328,6 +323,11 @@ bool runServerDual(
       return false;
     }
 
+    // Create AsyncMcServer instance
+    asyncMcServer =
+      std::make_shared<AsyncMcServer>(detail::createAsyncMcServerOptions(
+          mcrouterOpts, standaloneOpts, &evbs));
+
     setupRouter<RouterInfo>(mcrouterOpts, standaloneOpts, router, preRunCb);
 
     // Create CarbonRouterClients for each worker thread
@@ -515,10 +515,6 @@ bool runServer(
     // Get EVB of main thread
     auto localEvb = ioThreadPool->getEventBaseManager()->getEventBase();
 
-    asyncMcServer =
-        std::make_shared<AsyncMcServer>(detail::createAsyncMcServerOptions(
-            mcrouterOpts, standaloneOpts, &evbs));
-
     if (standaloneOpts.remote_thread) {
       router =
           CarbonRouterInstance<RouterInfo>::init("standalone", mcrouterOpts);
@@ -531,6 +527,10 @@ bool runServer(
       return false;
     }
 
+    asyncMcServer =
+      std::make_shared<AsyncMcServer>(detail::createAsyncMcServerOptions(
+          mcrouterOpts, standaloneOpts, &evbs));
+
     setupRouter<RouterInfo>(mcrouterOpts, standaloneOpts, router, preRunCb);
 
     auto shutdownStarted = std::make_shared<std::atomic<bool>>(false);