SERVER-43385 remove MMAPv1 references

4 files changed, 5 insertions, 17 deletions

diff --git a/buildscripts/gdb/mongo_lock.py b/buildscripts/gdb/mongo_lock.py
index 09996428a91..448d3518f46 100644
--- a/buildscripts/gdb/mongo_lock.py
+++ b/buildscripts/gdb/mongo_lock.py
@@ -309,10 +309,7 @@ def find_mutex_holder(graph, thread_dict, show):
 
 def find_lock_manager_holders(graph, thread_dict, show):  # pylint: disable=too-many-locals
     """Find lock manager holders."""
-    # In versions of MongoDB 4.0 and older, the LockerImpl class is templatized with a boolean
-    # parameter. With the removal of the MMAPv1 storage engine in MongoDB 4.2, the LockerImpl class
-    # is no longer templatized.
-    frame = find_frame(r'mongo::LockerImpl(?:\<.*\>)?::')
+    frame = find_frame(r'mongo::LockerImpl::')
     if not frame:
         return
 
@@ -321,15 +318,7 @@ def find_lock_manager_holders(graph, thread_dict, show):  # pylint: disable=too-
     (_, lock_waiter_lwpid, _) = gdb.selected_thread().ptid
     lock_waiter = thread_dict[lock_waiter_lwpid]
 
-    try:
-        locker_ptr_type = gdb.lookup_type("mongo::LockerImpl<false>").pointer()
-    except gdb.error as err:
-        # If we don't find the templatized version of the LockerImpl class, then we try to find the
-        # non-templatized version.
-        if not err.args[0].startswith("No type named"):
-            raise
-
-        locker_ptr_type = gdb.lookup_type("mongo::LockerImpl").pointer()
+    locker_ptr_type = gdb.lookup_type("mongo::LockerImpl").pointer()
 
     lock_head = gdb.parse_and_eval(
         "mongo::getGlobalLockManager()->_getBucket(resId)->findOrInsert(resId)")
diff --git a/buildscripts/packaging/msi/mongod.yaml b/buildscripts/packaging/msi/mongod.yaml
index ddfc798e4b4..ba10e7517ef 100644
--- a/buildscripts/packaging/msi/mongod.yaml
+++ b/buildscripts/packaging/msi/mongod.yaml
@@ -9,7 +9,6 @@ storage:
   journal:
     enabled: true
 #  engine:
-#  mmapv1:
 #  wiredTiger:
 
 # where to write logging data.
diff --git a/buildscripts/tests/ciconfig/evergreen.yml b/buildscripts/tests/ciconfig/evergreen.yml
index eeca00586b2..cb20efc55ec 100644
--- a/buildscripts/tests/ciconfig/evergreen.yml
+++ b/buildscripts/tests/ciconfig/evergreen.yml
@@ -138,7 +138,7 @@ tasks:
     - func: "setup"
     - func: "run tests"
       vars:
-        resmoke_args: "--suites=somesuite --storageEngine=mmapv1"
+        resmoke_args: "--suites=somesuite --storageEngine=wiredTiger"
 
 
 modules:
diff --git a/buildscripts/tests/ciconfig/test_evergreen.py b/buildscripts/tests/ciconfig/test_evergreen.py
index 2132e5ecf91..e1734016023 100644
--- a/buildscripts/tests/ciconfig/test_evergreen.py
+++ b/buildscripts/tests/ciconfig/test_evergreen.py
@@ -458,7 +458,7 @@ class TestVariant(unittest.TestCase):
 
         # Check combined_resmoke_args when test_flags is set on the variant.
         resmoke_task = variant_ubuntu.get_task("resmoke_task")
-        self.assertEqual("--suites=somesuite --storageEngine=mmapv1 --param=value --ubuntu",
+        self.assertEqual("--suites=somesuite --storageEngine=wiredTiger --param=value --ubuntu",
                          resmoke_task.combined_resmoke_args)
 
         # Check combined_resmoke_args when the task doesn't have resmoke_args.
@@ -468,7 +468,7 @@ class TestVariant(unittest.TestCase):
         # Check combined_resmoke_args when test_flags is not set on the variant.
         variant_debian = self.conf.get_variant("debian")
         resmoke_task = variant_debian.get_task("resmoke_task")
-        self.assertEqual("--suites=somesuite --storageEngine=mmapv1",
+        self.assertEqual("--suites=somesuite --storageEngine=wiredTiger",
                          resmoke_task.combined_resmoke_args)
 
         # Check for tasks included in task_groups