SERVER-13033: Static Initalizer race condition with CreateDirectClient and server-side Javascript

1 files changed, 9 insertions, 0 deletions

diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp
index fa5f6f67612..d8caf40827d 100644
--- a/src/mongo/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
@@ -81,6 +81,7 @@
 #include "mongo/platform/process_id.h"
 #include "mongo/s/d_logic.h"
 #include "mongo/s/stale_exception.h" // for SendStaleConfigException
+#include "mongo/scripting/engine.h"
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/file_allocator.h"
 #include "mongo/util/gcov.h"
@@ -1037,6 +1038,14 @@ namespace {
         return new DBDirectClient();
     }
 
+    MONGO_INITIALIZER(CreateJSDirectClient)
+        (InitializerContext* context) {
+
+        directDBClient = createDirectClient();
+
+        return Status::OK();
+    }
+
     mongo::mutex exitMutex("exit");
     AtomicUInt numExitCalls = 0;