SERVER-34794 Construct the global ServiceContext inside a MONGO_INITIALIZER

4 files changed, 4 insertions, 27 deletions

diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript
index dbc75f2f62f..dbc359e6787 100644
--- a/src/mongo/unittest/SConscript
+++ b/src/mongo/unittest/SConscript
@@ -21,8 +21,7 @@ env.Library(target="unittest",
 env.Library("unittest_main", ['unittest_main.cpp'],
             LIBDEPS=[
                 'unittest',
-                '$BUILD_DIR/mongo/db/service_context',
-                 ])
+            ])
 
 env.Library(target="integration_test_main",
             source=[
@@ -48,7 +47,6 @@ bmEnv.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/third_party/shim_benchmark',
     ],
 )
diff --git a/src/mongo/unittest/benchmark_main.cpp b/src/mongo/unittest/benchmark_main.cpp
index 3d43c5d6ab4..a29168ad5d5 100644
--- a/src/mongo/unittest/benchmark_main.cpp
+++ b/src/mongo/unittest/benchmark_main.cpp
@@ -34,8 +34,6 @@
 
 #include "mongo/base/initializer.h"
 #include "mongo/config.h"
-#include "mongo/db/service_context.h"
-#include "mongo/db/service_context_registrar.h"
 #include "mongo/util/log.h"
 #include "mongo/util/signal_handlers_synchronous.h"
 
@@ -44,12 +42,7 @@ int main(int argc, char** argv, char** envp) {
     ::mongo::clearSignalMask();
     ::mongo::setupSynchronousSignalHandlers();
 
-    ::mongo::ServiceContext* serviceContext = nullptr;
-    if (::mongo::hasServiceContextFactory()) {
-        ::mongo::setGlobalServiceContext(::mongo::createServiceContext());
-        serviceContext = ::mongo::getGlobalServiceContext();
-    }
-    ::mongo::runGlobalInitializersOrDie(argc, argv, envp, serviceContext);
+    ::mongo::runGlobalInitializersOrDie(argc, argv, envp);
 
     // Copied from the BENCHMARK_MAIN macro.
     ::benchmark::Initialize(&argc, argv);
diff --git a/src/mongo/unittest/integration_test_main.cpp b/src/mongo/unittest/integration_test_main.cpp
index 382ea69b087..b4087176542 100644
--- a/src/mongo/unittest/integration_test_main.cpp
+++ b/src/mongo/unittest/integration_test_main.cpp
@@ -71,14 +71,7 @@ ConnectionString getFixtureConnectionString() {
 
 int main(int argc, char** argv, char** envp) {
     setupSynchronousSignalHandlers();
-
-    ::mongo::ServiceContext* serviceContext = nullptr;
-    if (::mongo::hasServiceContextFactory()) {
-        ::mongo::setGlobalServiceContext(::mongo::createServiceContext());
-        serviceContext = ::mongo::getGlobalServiceContext();
-    }
-    runGlobalInitializersOrDie(argc, argv, envp, serviceContext);
-
+    runGlobalInitializersOrDie(argc, argv, envp);
     quickExit(unittest::Suite::run(std::vector<std::string>(), "", 1));
 }
 
diff --git a/src/mongo/unittest/unittest_main.cpp b/src/mongo/unittest/unittest_main.cpp
index 496221a87f9..f3f0e63754d 100644
--- a/src/mongo/unittest/unittest_main.cpp
+++ b/src/mongo/unittest/unittest_main.cpp
@@ -33,8 +33,6 @@
 
 #include "mongo/base/initializer.h"
 #include "mongo/base/status.h"
-#include "mongo/db/service_context.h"
-#include "mongo/db/service_context_registrar.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/options_parser/environment.h"
 #include "mongo/util/options_parser/option_section.h"
@@ -47,12 +45,7 @@ int main(int argc, char** argv, char** envp) {
     ::mongo::clearSignalMask();
     ::mongo::setupSynchronousSignalHandlers();
 
-    ::mongo::ServiceContext* serviceContext = nullptr;
-    if (::mongo::hasServiceContextFactory()) {
-        ::mongo::setGlobalServiceContext(::mongo::createServiceContext());
-        serviceContext = ::mongo::getGlobalServiceContext();
-    }
-    ::mongo::runGlobalInitializersOrDie(argc, argv, envp, serviceContext);
+    ::mongo::runGlobalInitializersOrDie(argc, argv, envp);
 
     namespace moe = ::mongo::optionenvironment;
     moe::OptionsParser parser;