SERVER-30135 Added a synchronous executor to make the code path between the two modes similar while still allowing customization in the execution. Should fix some perf regressions that came with unifying the service state machine.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 8c51e2dfb77..4af8f9a1d8d 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -412,12 +412,10 @@ static ExitCode runMongosServer() {
         return EXIT_NET_ERROR;
     }
 
-    if (auto svcExec = getGlobalServiceContext()->getServiceExecutor()) {
-        start = svcExec->start();
-        if (!start.isOK()) {
-            error() << "Failed to start the service executor: " << start;
-            return EXIT_NET_ERROR;
-        }
+    start = getGlobalServiceContext()->getServiceExecutor()->start();
+    if (!start.isOK()) {
+        error() << "Failed to start the service executor: " << start;
+        return EXIT_NET_ERROR;
     }
 
     getGlobalServiceContext()->notifyStartupComplete();