SERVER-13635 SERVER-1153: can choose heap1 at startup, but doesn't remotely work yet

Author: erh

src/mongo/SConscript

@@ -560,6 +560,7 @@ serverOnlyFiles = [ "db/curop.cpp",
                     "db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp",
                     "db/storage/mmap_v1/mmap_v1_engine.cpp",
                     "db/storage/mmap_v1/repair_database.cpp",
+                    "db/storage/storage_engine.cpp",
                     "db/operation_context_impl.cpp",
                     "db/storage/mmap_v1/mmap_v1_extent_manager.cpp",
                     "db/introspect.cpp",
@@ -917,6 +918,7 @@ env.Library("serveronly", serverOnlyFiles,
                      "db/repl/repl_settings",
                      "db/repl/replication_executor",
                      'db/storage/extent',
+                     'db/storage/heap1/storage_heap1',
                      'db/structure/record_store',
                      'db/structure/record_store_v1',
                      'db/structure/btree/btree',

src/mongo/db/catalog/database.cpp

@@ -104,7 +104,6 @@ namespace mongo {
 
     Database::Database(OperationContext* txn,
                        const std::string& name,
-                       bool& newDb,
                        DatabaseCatalogEntry* dbEntry )
         : _name(name),
           _dbEntry( dbEntry ),
@@ -120,7 +119,6 @@ namespace mongo {
         }
 
         _profile = serverGlobalParams.defaultProfile;
-        newDb = !_dbEntry->exists();
     }
 
 

src/mongo/db/catalog/database.h

@@ -58,7 +58,6 @@ namespace mongo {
         // you probably need to be in dbHolderMutex when constructing this
         Database(OperationContext* txn,
                  const std::string& name,
-                 bool& newDb, /* out */
                  DatabaseCatalogEntry* dbEntry );
 
         /* you must use this to close - there is essential code in this method that is not in the ~Database destructor.

src/mongo/db/catalog/database_holder.cpp

@@ -94,10 +94,13 @@ namespace mongo {
         cc().writeHappened();
 
         // this locks _m for defensive checks, so we don't want to be locked right here :
+        invariant( globalStorageEngine );
+        DatabaseCatalogEntry* entry = globalStorageEngine->getDatabaseCatalogEntry( txn, dbname );
+        invariant( entry );
+        justCreated = !entry->exists();
         Database *db = new Database(txn,
                                     dbname,
-                                    justCreated,
-                                    globalStorageEngine->getDatabaseCatalogEntry( txn, dbname ) );
+                                    entry );
 
         {
             SimpleMutex::scoped_lock lk(_m);

src/mongo/db/commands/apply_ops.cpp

@@ -91,6 +91,7 @@ namespace mongo {
                 while ( i.more() ) {
                     BSONObj f = i.next().Obj();
 
+                    DBDirectClient db( txn );
                     BSONObj realres = db.findOne( f["ns"].String() , f["q"].Obj() );
 
                     // Apply-ops would never have a $where matcher, so use the default callback,
@@ -172,8 +173,6 @@ namespace mongo {
             return errors == 0;
         }
 
-        DBDirectClient db;
-
     } applyOpsCmd;
 
 }

src/mongo/db/commands/drop_indexes.cpp

@@ -215,7 +215,7 @@ namespace mongo {
         }
 
         bool run(OperationContext* txn, const string& dbname , BSONObj& jsobj, int, string& errmsg, BSONObjBuilder& result, bool /*fromRepl*/) {
-            static DBDirectClient db;
+            DBDirectClient db;
 
             BSONElement e = jsobj.firstElement();
             string toDeleteNs = dbname + '.' + e.valuestr();

src/mongo/db/instance.cpp

@@ -56,7 +56,6 @@
 #include "mongo/db/storage/mmap_v1/dur_commitjob.h"
 #include "mongo/db/storage/mmap_v1/dur_journal.h"
 #include "mongo/db/storage/mmap_v1/dur_recover.h"
-#include "mongo/db/storage/mmap_v1/mmap_v1_engine.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/db/global_optime.h"
 #include "mongo/db/global_environment_experiment.h"
@@ -115,8 +114,6 @@ namespace mongo {
     HANDLE lockFileHandle;
 #endif
 
-    StorageEngine* globalStorageEngine = new MMAPV1Engine(); // TODO: put this somewhere else
-
     MONGO_FP_DECLARE(rsStopGetMore);
 
     void inProgCmd( Message &m, DbResponse &dbresponse ) {
@@ -551,7 +548,8 @@ namespace mongo {
         invariant(txn->lockState()->isW());
 
         Database* database = dbHolder().get(txn, db);
-        invariant(database != NULL);
+        if ( !database )
+            return;
 
         repl::oplogCheckCloseDatabase(txn, database); // oplog caches some things, dirty its caches
 
@@ -1020,7 +1018,9 @@ namespace {
         return new DBDirectClient();
     }
 
-    MONGO_INITIALIZER(CreateJSDirectClient)
+    MONGO_INITIALIZER_GENERAL(CreateJSDirectClient,
+                              ("StorageEngineInit"),
+                              MONGO_NO_DEPENDENTS)
         (InitializerContext* context) {
 
         directDBClient = createDirectClient();

src/mongo/db/mongod_options.cpp

@@ -155,6 +155,11 @@ namespace mongo {
 
         // Storage Options
 
+        general_options.addOptionChaining("storage.engine", "storageEngine", moe::String,
+                                          "what storage engine to use")
+            .setDefault(moe::Value(std::string("mmapv1")));
+
+
 #ifdef _WIN32
         boost::filesystem::path currentPath = boost::filesystem::current_path();
 
@@ -859,6 +864,8 @@ namespace mongo {
                           "files");
         }
 
+        storageGlobalParams.engine = params["storage.engine"].as<string>();
+
         if (params.count("storage.dbPath")) {
             storageGlobalParams.dbpath = params["storage.dbPath"].as<string>();
             if (params.count("processManagement.fork") && storageGlobalParams.dbpath[0] != '/') {

src/mongo/db/operation_context_impl.cpp

@@ -34,14 +34,15 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/repl/is_master.h"
 #include "mongo/db/repl/repl_coordinator_global.h"
-#include "mongo/db/storage/mmap_v1/dur_recovery_unit.h"
+#include "mongo/db/storage/storage_engine.h"
 #include "mongo/platform/random.h"
 #include "mongo/util/fail_point_service.h"
 
 namespace mongo {
 
     OperationContextImpl::OperationContextImpl() {
-        _recovery.reset(new DurRecoveryUnit(this));
+        invariant( globalStorageEngine );
+        _recovery.reset(globalStorageEngine->newRecoveryUnit(this));
     }
 
     RecoveryUnit* OperationContextImpl::recoveryUnit() const {

src/mongo/db/restapi.cpp

@@ -70,6 +70,8 @@ namespace mongo {
                              string& responseMsg, int& responseCode,
                              vector<string>& headers,  const SockAddr &from ) {
 
+            DBDirectClient db( txn );
+
             string::size_type first = url.find( "/" , 1 );
             if ( first == string::npos ) {
                 responseCode = 400;
@@ -106,11 +108,11 @@ namespace mongo {
 
             if ( method == "GET" ) {
                 responseCode = 200;
-                html = handleRESTQuery( fullns , action , params , responseCode , ss  );
+                html = handleRESTQuery( db, fullns, action, params, responseCode, ss  );
             }
             else if ( method == "POST" ) {
                 responseCode = 201;
-                handlePost( fullns , MiniWebServer::body( rq ) , params , responseCode , ss  );
+                handlePost( db, fullns, MiniWebServer::body( rq ), params, responseCode, ss  );
             }
             else {
                 responseCode = 400;
@@ -127,7 +129,8 @@ namespace mongo {
             responseMsg = ss.str();
         }
 
-        bool handleRESTQuery( const std::string& ns,
+        bool handleRESTQuery( DBDirectClient& db,
+                              const std::string& ns,
                               const std::string& action,
                               BSONObj & params,
                               int & responseCode,
@@ -229,7 +232,8 @@ namespace mongo {
         }
 
         // TODO Generate id and revision per couch POST spec
-        void handlePost( const std::string& ns,
+        void handlePost( DBDirectClient& db,
+                         const std::string& ns,
                          const char *body,
                          BSONObj& params,
                          int & responseCode,
@@ -256,8 +260,6 @@ namespace mongo {
             return def;
         }
 
-        DBDirectClient db;
-
     } restHandler;
 
     bool RestAdminAccess::haveAdminUsers(OperationContext* txn) const {