SERVER-33579 Use mobile storage engine as default for embedded and remove dependency on WiredTiger.

4 files changed, 22 insertions, 7 deletions

diff --git a/src/mongo/client/embedded/SConscript b/src/mongo/client/embedded/SConscript
index 4c0741c275a..49878d86a70 100644
--- a/src/mongo/client/embedded/SConscript
+++ b/src/mongo/client/embedded/SConscript
@@ -87,7 +87,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/storage_interface_impl',
         '$BUILD_DIR/mongo/db/startup_warnings_mongod',
         '$BUILD_DIR/mongo/db/storage/mobile/storage_mobile',
-        '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger',
         '$BUILD_DIR/mongo/util/net/network',
         '$BUILD_DIR/mongo/util/version_impl',
         'embedded_options',
diff --git a/src/mongo/client/embedded/embedded_options.cpp b/src/mongo/client/embedded/embedded_options.cpp
index 97b3483b1c1..f47f771d3f7 100644
--- a/src/mongo/client/embedded/embedded_options.cpp
+++ b/src/mongo/client/embedded/embedded_options.cpp
@@ -52,6 +52,9 @@ Status addOptions(optionenvironment::OptionSection* options) {
 
     moe::OptionSection storage_options("Storage options");
 
+    storage_options.addOptionChaining(
+        "storage.engine", "storageEngine", moe::String, "what storage engine to use");
+
 #ifdef _WIN32
     boost::filesystem::path currentPath = boost::filesystem::current_path();
 
@@ -94,6 +97,11 @@ Status canonicalizeOptions(optionenvironment::Environment* params) {
 }
 
 Status storeOptions(const moe::Environment& params) {
+    if (params.count("storage.engine")) {
+        storageGlobalParams.engine = params["storage.engine"].as<std::string>();
+        storageGlobalParams.engineSetByUser = true;
+    }
+
     if (params.count("storage.dbPath")) {
         storageGlobalParams.dbpath = params["storage.dbPath"].as<string>();
         if (params.count("processManagement.fork") && storageGlobalParams.dbpath[0] != '/') {
diff --git a/src/mongo/client/embedded/embedded_transport_layer_test.cpp b/src/mongo/client/embedded/embedded_transport_layer_test.cpp
index f2eb1d102ae..1172f63e9b3 100644
--- a/src/mongo/client/embedded/embedded_transport_layer_test.cpp
+++ b/src/mongo/client/embedded/embedded_transport_layer_test.cpp
@@ -55,9 +55,12 @@ protected:
         if (!globalTempDir) {
             globalTempDir = mongo::stdx::make_unique<mongo::unittest::TempDir>("embedded_mongo");
         }
-        int argc = 3;
-        const char* argv[] = {
-            "mongo_embedded_transport_layer_test", "--dbpath", globalTempDir->path().c_str()};
+        int argc = 5;
+        const char* argv[] = {"mongo_embedded_transport_layer_test",
+                              "--storageEngine",
+                              "mobile",
+                              "--dbpath",
+                              globalTempDir->path().c_str()};
         db_handle = libmongodbcapi_db_new(argc, argv, nullptr);
 
         mongoc_init();
diff --git a/src/mongo/client/embedded/libmongodbcapi_test.cpp b/src/mongo/client/embedded/libmongodbcapi_test.cpp
index 69be2750540..4b8b912b65c 100644
--- a/src/mongo/client/embedded/libmongodbcapi_test.cpp
+++ b/src/mongo/client/embedded/libmongodbcapi_test.cpp
@@ -68,9 +68,14 @@ protected:
         if (!globalTempDir) {
             globalTempDir = mongo::stdx::make_unique<mongo::unittest::TempDir>("embedded_mongo");
         }
-        const char* argv[] = {
-            "mongo_embedded_capi_test", "--port", "0", "--dbpath", globalTempDir->path().c_str()};
-        db = libmongodbcapi_db_new(5, argv, nullptr);
+        const char* argv[] = {"mongo_embedded_capi_test",
+                              "--port",
+                              "0",
+                              "--storageEngine",
+                              "mobile",
+                              "--dbpath",
+                              globalTempDir->path().c_str()};
+        db = libmongodbcapi_db_new(7, argv, nullptr);
         ASSERT(db != nullptr);
     }