Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 0 insertions, 42 deletions

diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py
index fa9a2e98ebd..19354d4c314 100644
--- a/buildscripts/resmokelib/core/programs.py
+++ b/buildscripts/resmokelib/core/programs.py
@@ -6,9 +6,7 @@ Handles all the nitty-gritty parameter conversion.
 import json
 import os
 import os.path
-import re
 import stat
-from packaging import version
 
 from buildscripts.resmokelib import config
 from buildscripts.resmokelib import utils
@@ -45,31 +43,6 @@ def get_path_env_var(env_vars):
     return path
 
 
-def get_binary_version(executable):
-    """Return the string for the binary version of the given executable."""
-
-    # pylint: disable=wrong-import-position
-    from buildscripts.resmokelib.multiversionconstants import LATEST_FCV
-
-    split_executable = executable.split("-")
-    version_regex = re.compile(version.VERSION_PATTERN, re.VERBOSE | re.IGNORECASE)
-    if len(split_executable) > 1 and version_regex.match(split_executable[-1]):
-        return split_executable[-1]
-    return LATEST_FCV
-
-
-def remove_set_parameter_if_before_version(set_parameters, parameter_name, bin_version,
-                                           required_bin_version):
-    """
-    Used for removing a server parameter that does not exist prior to a specified version.
-
-    Remove 'parameter_name' from the 'set_parameters' dictionary if 'bin_version' is older than
-    'required_bin_version'.
-    """
-    if version.parse(bin_version) < version.parse(required_bin_version):
-        set_parameters.pop(parameter_name, None)
-
-
 def mongod_program(logger, job_num, executable, process_kwargs, mongod_options):
     """
     Return a Process instance that starts mongod arguments constructed from 'mongod_options'.
@@ -81,17 +54,12 @@ def mongod_program(logger, job_num, executable, process_kwargs, mongod_options):
     @param mongod_options - A HistoryDict describing the various options to pass to the mongod.
     """
 
-    bin_version = get_binary_version(executable)
     args = [executable]
     mongod_options = mongod_options.copy()
 
     if "port" not in mongod_options:
         mongod_options["port"] = network.PortAllocator.next_fixture_port(job_num)
     suite_set_parameters = mongod_options.get("set_parameters", {})
-    remove_set_parameter_if_before_version(suite_set_parameters, "internalQueryStatsRateLimit",
-                                           bin_version, "6.0")
-    remove_set_parameter_if_before_version(
-        suite_set_parameters, "internalQueryStatsErrorsAreCommandFatal", bin_version, "6.0")
     _apply_set_parameters(args, suite_set_parameters)
     mongod_options.pop("set_parameters")
 
@@ -110,7 +78,6 @@ def mongod_program(logger, job_num, executable, process_kwargs, mongod_options):
 
 def mongos_program(logger, job_num, executable=None, process_kwargs=None, mongos_options=None):  # pylint: disable=too-many-arguments
     """Return a Process instance that starts a mongos with arguments constructed from 'kwargs'."""
-    bin_version = get_binary_version(executable)
     args = [executable]
 
     mongos_options = mongos_options.copy()
@@ -118,10 +85,6 @@ def mongos_program(logger, job_num, executable=None, process_kwargs=None, mongos
     if "port" not in mongos_options:
         mongos_options["port"] = network.PortAllocator.next_fixture_port(job_num)
     suite_set_parameters = mongos_options.get("set_parameters", {})
-    remove_set_parameter_if_before_version(suite_set_parameters, "internalQueryStatsRateLimit",
-                                           bin_version, "6.0")
-    remove_set_parameter_if_before_version(
-        suite_set_parameters, "internalQueryStatsErrorsAreCommandFatal", bin_version, "6.0")
     _apply_set_parameters(args, suite_set_parameters)
     mongos_options.pop("set_parameters")
 
@@ -288,11 +251,6 @@ def mongo_shell_program(  # pylint: disable=too-many-arguments,too-many-branches
     # Load a callback to check that all orphans are deleted before shutting down a ShardingTest.
     eval_sb.append("load('jstests/libs/override_methods/check_orphans_are_deleted.js');")
 
-    if config.FUZZ_MONGOD_CONFIGS is not None and config.FUZZ_MONGOD_CONFIGS is not False:
-        # Prevent commands from running with the config fuzzer.
-        eval_sb.append(
-            "load('jstests/libs/override_methods/config_fuzzer_incompatible_commands.js');")
-
     # Load this file to retry operations that fail due to in-progress background operations.
     eval_sb.append(
         "load('jstests/libs/override_methods/implicitly_retry_on_background_op_in_progress.js');")