SERVER-55208: Remove nojournal,duroff and evergreen variant

5 files changed, 2 insertions, 21 deletions

diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py
index c4c97238327..8c94cadcad9 100644
--- a/buildscripts/resmokelib/core/programs.py
+++ b/buildscripts/resmokelib/core/programs.py
@@ -135,7 +135,6 @@ def mongo_shell_program(  # pylint: disable=too-many-arguments,too-many-branches
         "enableMajorityReadConcern": (config.MAJORITY_READ_CONCERN, True),
         "mixedBinVersions": (config.MIXED_BIN_VERSIONS, ""),
         "multiversionBinVersion": (shell_mixed_version, ""),
-        "noJournal": (config.NO_JOURNAL, False),
         "storageEngine": (config.STORAGE_ENGINE, ""),
         "storageEngineCacheSizeGB": (config.STORAGE_ENGINE_CACHE_SIZE, ""),
         "testName": (test_name, ""),
diff --git a/buildscripts/resmokelib/powercycle/powercycle.py b/buildscripts/resmokelib/powercycle/powercycle.py
index 21f9b74b37c..84718599dd1 100755
--- a/buildscripts/resmokelib/powercycle/powercycle.py
+++ b/buildscripts/resmokelib/powercycle/powercycle.py
@@ -1329,7 +1329,6 @@ def main(parser_actions, options):  # pylint: disable=too-many-branches,too-many
     # Initialize the mongod options
     # Note - We use posixpath for Windows client to Linux server scenarios.
     root_dir = f"{powercycle_constants.REMOTE_DIR}/mongodb-powercycle-test-{int(time.time())}"
-    mongod_options_map = parse_options(task_config.mongod_options)
     set_fcv_cmd = "set_fcv" if task_config.fcv is not None else ""
 
     # Error out earlier if these options are not properly specified
@@ -1411,11 +1410,6 @@ def main(parser_actions, options):  # pylint: disable=too-many-branches,too-many
     mongo_repo_root_dir = os.getcwd()
 
     # Setup the validate_canary option.
-    if "nojournal" in mongod_options_map:
-        LOGGER.error("Cannot create and validate canary documents if the mongod option"
-                     " '--nojournal' is used.")
-        local_exit(1)
-
     canary_doc = ""
 
     # Set the Pymongo connection timeout to 1 hour for canary insert & validation.
diff --git a/buildscripts/resmokelib/run/__init__.py b/buildscripts/resmokelib/run/__init__.py
index 20ff72c2c79..b16517f1d79 100644
--- a/buildscripts/resmokelib/run/__init__.py
+++ b/buildscripts/resmokelib/run/__init__.py
@@ -633,9 +633,6 @@ class RunPlugin(PluginInterface):
                   " started by resmoke.py. The argument is specified as bracketed YAML -"
                   " i.e. JSON with support for single quoted and unquoted keys."))
 
-        parser.add_argument("--nojournal", action="store_true", dest="no_journal",
-                            help="Disables journaling for all mongod's.")
-
         parser.add_argument("--numClientsPerFixture", type=int, dest="num_clients_per_fixture",
                             help="Number of clients running tests per fixture.")
 
diff --git a/buildscripts/resmokelib/testing/fixtures/replicaset.py b/buildscripts/resmokelib/testing/fixtures/replicaset.py
index 7f502f6be76..a43b72a6d84 100644
--- a/buildscripts/resmokelib/testing/fixtures/replicaset.py
+++ b/buildscripts/resmokelib/testing/fixtures/replicaset.py
@@ -160,9 +160,7 @@ class ReplicaSetFixture(interface.ReplFixture):  # pylint: disable=too-many-inst
                 "writeConcernMajorityJournalDefault"] = self.write_concern_majority_journal_default
         else:
             server_status = client.admin.command({"serverStatus": 1})
-            cmd_line_opts = client.admin.command({"getCmdLineOpts": 1})
-            if not (server_status["storageEngine"]["persistent"] and cmd_line_opts["parsed"].get(
-                    "storage", {}).get("journal", {}).get("enabled", True)):
+            if not server_status["storageEngine"]["persistent"]:
                 repl_config["writeConcernMajorityJournalDefault"] = False
 
         if self.replset_config_options.get("configsvr", False):
diff --git a/buildscripts/resmokelib/testing/fixtures/standalone.py b/buildscripts/resmokelib/testing/fixtures/standalone.py
index 898a622d326..03dc436e15d 100644
--- a/buildscripts/resmokelib/testing/fixtures/standalone.py
+++ b/buildscripts/resmokelib/testing/fixtures/standalone.py
@@ -311,7 +311,6 @@ class MongodLauncher(object):
 
         shortcut_opts = {
             "enableMajorityReadConcern": self.config.MAJORITY_READ_CONCERN,
-            "nojournal": self.config.NO_JOURNAL,
             "storageEngine": self.config.STORAGE_ENGINE,
             "transportLayer": self.config.TRANSPORT_LAYER,
             "wiredTigerCollectionConfigString": self.config.WT_COLL_CONFIG,
@@ -327,16 +326,10 @@ class MongodLauncher(object):
             shortcut_opts["wiredTigerCacheSizeGB"] = self.config.STORAGE_ENGINE_CACHE_SIZE
 
         # These options are just flags, so they should not take a value.
-        opts_without_vals = ("nojournal", "logappend")
-
-        # Have the --nojournal command line argument to resmoke.py unset the journal option.
-        if shortcut_opts["nojournal"] and "journal" in mongod_options:
-            del mongod_options["journal"]
+        opts_without_vals = ("logappend")
 
         # Ensure that config servers run with journaling enabled.
         if "configsvr" in mongod_options:
-            shortcut_opts["nojournal"] = False
-            mongod_options["journal"] = ""
             suite_set_parameters.setdefault("reshardingMinimumOperationDurationMillis", 5000)
             suite_set_parameters.setdefault("reshardingCriticalSectionTimeoutMillis",
                                             24 * 60 * 60)  # 24 hours