SERVER-35112 Remove MMAPv1 code

Author: GeertBosch

jstests/noPassthroughWithMongod/repair_unsupported_options.js

@@ -0,0 +1,10 @@
+// SERVER-35112: Test that specifying removed MMAPv1 specific options gives correct error.
+(function() {
+    'use strict';
+    db.repair_unsupported_options.drop();
+    assert.commandWorked(db.repair_unsupported_options.insert({}));  // Ensure database exists.
+    let badValue = (cmd) => assert.commandFailedWithCode(db.runCommand(cmd), ErrorCodes.BadValue);
+    badValue({repairDatabase: 1, preserveClonedFilesOnFailure: 1});
+    badValue({repairDatabase: 1, backupOriginalFiles: 1});
+    assert.commandWorked(db.runCommand({repairDatabase: 1, someRandomUnknownOption: 1}));
+})();

src/mongo/db/SConscript

@@ -471,7 +471,6 @@ env.Library(
         "mongod_options.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/storage/mmap_v1/mmap_v1_options',
         'repl/repl_settings',
         'repl/replica_set_messages',
         'server_options_servers',
@@ -695,6 +694,9 @@ env.Library(
         'index/index_access_method',
         'write_ops',
     ],
+    LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/commands/server_status_core',
+    ],
 )
 
 env.Library(
@@ -857,19 +859,6 @@ env.Library(
     ],
 )
 
-env.Library(
-    target='prefetch',
-    source=[
-        'prefetch.cpp',
-    ],
-    LIBDEPS=[
-        'dbhelpers',
-        'index/index_access_method',
-        '$BUILD_DIR/mongo/db/stats/timer_stats',
-        '$BUILD_DIR/mongo/db/storage/mmap_v1/mmap',
-    ],
-)
-
 env.Library(
     target="rw_concern_d",
     source=[
@@ -886,6 +875,9 @@ env.Library(
         "storage/storage_options",
         "s/sharding",
     ],
+    LIBDEPS_PRIVATE=[
+        "commands/server_status_core",
+    ],
 )
 
 env.Library(
@@ -896,7 +888,6 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/catalog/collection',
         '$BUILD_DIR/mongo/db/catalog/database',
-        '$BUILD_DIR/mongo/db/storage/mmap_v1/repair_database_interface',
         'background',
         'logical_clock',
     ],
@@ -920,6 +911,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/commands/fsync_locked',
+        'commands/server_status_core',
         'write_ops',
     ]
 )
@@ -1035,6 +1027,9 @@ env.Library(
         'storage/storage_options',
         'update/update_driver',
     ],
+    LIBDEPS_PRIVATE=[
+        "commands/server_status_core",
+    ],
 )
 
 env.Library(
@@ -1047,7 +1042,6 @@ env.Library(
     LIBDEPS=[
         "$BUILD_DIR/mongo/db/bson/dotted_path_support",
         "$BUILD_DIR/mongo/db/logical_time_metadata_hook",
-        "$BUILD_DIR/mongo/db/storage/mmap_v1/file_allocator",
         "$BUILD_DIR/mongo/db/ttl_collection_cache",
         "$BUILD_DIR/mongo/executor/network_interface_factory",
         "$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl",
@@ -1085,7 +1079,6 @@ env.Library(
         "op_observer_d",
         "ops/write_ops_parsers",
         "pipeline/aggregation",
-        "prefetch",
         "query_exec",
         "repair_database",
         "repl/bgsync",
@@ -1111,8 +1104,6 @@ env.Library(
         "stats/top",
         "storage/devnull/storage_devnull",
         "storage/ephemeral_for_test/storage_ephemeral_for_test",
-        "storage/mmap_v1/mmap",
-        "storage/mmap_v1/storage_mmapv1",
         "storage/storage_engine_lock_file",
         "storage/storage_engine_metadata",
         "storage/storage_init_d",

src/mongo/db/catalog/SConscript

@@ -294,9 +294,9 @@ env.Library(
         '$BUILD_DIR/mongo/db/views/views_mongod',
     ],
     LIBDEPS_PRIVATE=[
+        "$BUILD_DIR/mongo/db/commands/server_status_core",
         '$BUILD_DIR/mongo/db/logical_clock',
         '$BUILD_DIR/mongo/db/repl/repl_settings',
-        '$BUILD_DIR/mongo/db/storage/mmap_v1/mmap_v1_options',
         '$BUILD_DIR/mongo/db/storage/storage_engine_common',
     ],
 )

src/mongo/db/catalog/collection.cpp

@@ -56,7 +56,6 @@
 #include "mongo/db/server_parameters.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/storage/key_string.h"
-#include "mongo/db/storage/mmap_v1/mmap_v1_options.h"
 #include "mongo/db/storage/record_fetcher.h"
 #include "mongo/db/storage/record_store.h"
 #include "mongo/db/update/update_driver.h"

src/mongo/db/catalog/collection_impl.cpp

@@ -64,7 +64,6 @@
 #include "mongo/db/server_parameters.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/storage/key_string.h"
-#include "mongo/db/storage/mmap_v1/mmap_v1_options.h"
 #include "mongo/db/storage/record_fetcher.h"
 #include "mongo/db/storage/record_store.h"
 #include "mongo/db/update/update_driver.h"
@@ -799,9 +798,6 @@ bool CollectionImpl::_enforceQuota(bool userEnforeQuota) const {
     if (!userEnforeQuota)
         return false;
 
-    if (!mmapv1GlobalOptions.quota)
-        return false;
-
     if (_ns.db() == "local")
         return false;
 

src/mongo/db/commands/SConscript

@@ -167,10 +167,10 @@ env.Library(
         "fsync.cpp",
     ],
     LIBDEPS_PRIVATE=[
+	'$BUILD_DIR/mongo/db/auth/authprivilege',
         '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
         '$BUILD_DIR/mongo/db/curop',
-        '$BUILD_DIR/mongo/db/storage/mmap_v1/storage_mmapv1',
         'fsync_locked',
     ]
 )

src/mongo/db/commands/dbcommands.cpp

@@ -240,15 +240,16 @@ class CmdRepairDatabase : public ErrmsgCommandDeprecated {
         log() << "repairDatabase " << dbname;
         BackgroundOperation::assertNoBgOpInProgForDb(dbname);
 
-        e = cmdObj.getField("preserveClonedFilesOnFailure");
-        bool preserveClonedFilesOnFailure = e.isBoolean() && e.boolean();
-        e = cmdObj.getField("backupOriginalFiles");
-        bool backupOriginalFiles = e.isBoolean() && e.boolean();
+        uassert(ErrorCodes::BadValue,
+                "preserveClonedFilesOnFailure not supported",
+                !cmdObj.getField("preserveClonedFilesOnFailure").trueValue());
+        uassert(ErrorCodes::BadValue,
+                "backupOriginalFiles not supported",
+                !cmdObj.getField("backupOriginalFiles").trueValue());
 
         StorageEngine* engine = getGlobalServiceContext()->getStorageEngine();
         repl::UnreplicatedWritesBlock uwb(opCtx);
-        Status status = repairDatabase(
-            opCtx, engine, dbname, preserveClonedFilesOnFailure, backupOriginalFiles);
+        Status status = repairDatabase(opCtx, engine, dbname);
 
         // Open database before returning
         DatabaseHolder::getDatabaseHolder().openDb(opCtx, dbname);

src/mongo/db/commands/fsync.cpp

@@ -48,7 +48,6 @@
 #include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/db.h"
 #include "mongo/db/service_context.h"
-#include "mongo/db/storage/mmap_v1/dur.h"
 #include "mongo/db/storage/storage_engine.h"
 #include "mongo/stdx/condition_variable.h"
 #include "mongo/util/assert_util.h"
@@ -135,17 +134,6 @@ class FSyncCommand : public ErrmsgCommandDeprecated {
         log() << "CMD fsync: sync:" << sync << " lock:" << lock;
 
         if (!lock) {
-            // the simple fsync command case
-            if (sync) {
-                // can this be GlobalRead? and if it can, it should be nongreedy.
-                Lock::GlobalWrite w(opCtx);
-                // TODO SERVER-26822: Replace MMAPv1 specific calls with ones that are storage
-                // engine agnostic.
-                getDur().commitNow(opCtx);
-
-                //  No WriteUnitOfWork needed, as this does no writes of its own.
-            }
-
             // Take a global IS lock to ensure the storage engine is not shutdown
             Lock::GlobalLock global(opCtx, MODE_IS);
             StorageEngine* storageEngine = getGlobalServiceContext()->getStorageEngine();
@@ -345,16 +333,6 @@ void FSyncLockThread::run() {
         OperationContext& opCtx = *opCtxPtr;
         Lock::GlobalWrite global(&opCtx);  // No WriteUnitOfWork needed
 
-        try {
-            // TODO SERVER-26822: Replace MMAPv1 specific calls with ones that are storage engine
-            // agnostic.
-            getDur().syncDataAndTruncateJournal(&opCtx);
-        } catch (const std::exception& e) {
-            error() << "error doing syncDataAndTruncateJournal: " << e.what();
-            fsyncCmd.threadStatus = Status(ErrorCodes::CommandFailed, e.what());
-            fsyncCmd.acquireFsyncLockSyncCV.notify_one();
-            return;
-        }
         opCtx.lockState()->downgradeGlobalXtoSForMMAPV1();
         StorageEngine* storageEngine = getGlobalServiceContext()->getStorageEngine();
 

src/mongo/db/db.cpp

@@ -126,7 +126,6 @@
 #include "mongo/db/startup_warnings_mongod.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/db/storage/encryption_hooks.h"
-#include "mongo/db/storage/mmap_v1/mmap_v1_options.h"
 #include "mongo/db/storage/storage_engine.h"
 #include "mongo/db/storage/storage_engine_init.h"
 #include "mongo/db/storage/storage_options.h"
@@ -405,21 +404,12 @@ ExitCode _initAndListen(int listenPort) {
         uassert(10296, ss.str().c_str(), boost::filesystem::exists(storageGlobalParams.dbpath));
     }
 
-    {
-        std::stringstream ss;
-        ss << "repairpath (" << storageGlobalParams.repairpath << ") does not exist";
-        uassert(12590, ss.str().c_str(), boost::filesystem::exists(storageGlobalParams.repairpath));
-    }
-
     initializeSNMP();
 
     if (!storageGlobalParams.readOnly) {
         boost::filesystem::remove_all(storageGlobalParams.dbpath + "/_tmp/");
     }
 
-    if (mmapv1GlobalOptions.journalOptions & MMAPV1Options::JournalRecoverOnly)
-        return EXIT_NET_ERROR;
-
     if (mongodGlobalParams.scriptingEnabled) {
         ScriptEngine::setup();
     }

src/mongo/db/index/SConscript

@@ -85,7 +85,6 @@ serveronlyEnv.Library(
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/storage/encryption_hooks',
-        '$BUILD_DIR/mongo/db/storage/mmap_v1/btree',
         '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/third_party/shim_snappy',
         'index_descriptor',