SERVER-64845 Bump for 6.0.0 GA

ref: 31b70b7fe6..c5e905e5bf
for: 6.0.0-rc13

WT-9500       Fix RTS to use cell time window instead of key/value timestamps of HS update

.pydocstyle

@@ -9,6 +9,10 @@ inherit = false
 # D212 - Multi-line docstring summary should start at the first line
 # D213 - Multi-line docstring summary should start at the second line
 # D301 - Use r""" if any backslashes in a docstring
-ignore = D105,D202,D203,D212,D213,D301
+# D401 - First line should be in imperative mood
+# D407 - Missing dashed underline after section
+# D413 - Missing blank line after last section
+# D415 - First line should end with a period, question mark, or exclamation point
+ignore = D105,D202,D203,D212,D213,D301,D401,D407,D413,D415
 # Do not run on buildscripts/tests/
 match = ^((?!buildscripts[\\\/]tests[\\\/]).)*$

README.md

@@ -90,3 +90,4 @@ Welcome to MongoDB!
   October 16, 2018, including patch fixes for prior versions, are published
   under the [Server Side Public License (SSPL) v1](LICENSE-Community.txt).
   See individual files for details.
+

SConstruct

@@ -2,7 +2,6 @@
 
 import atexit
 import copy
-import datetime
 import errno
 import json
 import os
@@ -962,6 +961,11 @@ env_vars.Add('MSVC_VERSION',
     help='Sets the version of Visual C++ to use (e.g. 14.2 for VS2019, 14.3 for VS2022)',
     default="14.3")
 
+env_vars.Add('NINJA_BUILDDIR',
+    help="Location for shared Ninja state",
+    default="$BUILD_DIR/ninja",
+)
+
 env_vars.Add('NINJA_PREFIX',
     default="build",
     help="""A prefix to add to the beginning of generated ninja
@@ -1207,7 +1211,6 @@ envDict = dict(BUILD_ROOT=buildDir,
                LIBDEPS_TAG_EXPANSIONS=[],
                )
 
-
 # By default, we will get the normal SCons tool search. But if the
 # user has opted into the next gen tools, add our experimental tool
 # directory into the default toolpath, ahead of whatever is already in
@@ -3889,6 +3892,71 @@ def doConfigure(myenv):
 
         myenv = conf.Finish()
 
+    # Our build generally assumes that we have C11-compliant libc headers for
+    # C++ source. On most systems, that will be the case. However, on systems
+    # using glibc older than 2.18 (or other libc implementations that have
+    # stubbornly refused to update), we need to add some preprocessor defines.
+    #
+    # See: https://sourceware.org/bugzilla/show_bug.cgi?id=15366
+    #
+    # These headers are only fully standards-compliant on POSIX platforms. Windows
+    # in particular doesn't implement inttypes.h
+    if env.TargetOSIs('posix'):
+        def NeedStdCLimitMacros(context):
+            test_body="""
+            #undef __STDC_LIMIT_MACROS
+            #include <stdint.h>
+            #if defined(INT64_MAX)
+            #  error
+            #endif
+            """
+            context.Message('Checking whether to define __STDC_LIMIT_MACROS... ')
+            ret = context.TryCompile(textwrap.dedent(test_body), '.cpp')
+            context.Result(ret)
+            return ret
+
+        def NeedStdCConstantMacros(context):
+            test_body="""
+            #undef __STDC_CONSTANT_MACROS
+            #include <stdint.h>
+            #if defined(INTMAX_C)
+            #  error
+            #endif
+            """
+            context.Message('Checking whether to define __STDC_CONSTANT_MACROS... ')
+            ret = context.TryCompile(textwrap.dedent(test_body), '.cpp')
+            context.Result(ret)
+            return ret
+
+        def NeedStdCFormatMacros(context):
+            test_body="""
+            #undef __STDC_FORMAT_MACROS
+            #include <inttypes.h>
+            #if defined(PRIx64)
+            #  error
+            #endif
+            """
+            context.Message('Checking whether to define __STDC_FORMAT_MACROS... ')
+            ret = context.TryCompile(textwrap.dedent(test_body), '.cpp')
+            context.Result(ret)
+            return ret
+
+        conf = Configure(myenv, help=False, custom_tests = {
+            'NeedStdCLimitMacros': NeedStdCLimitMacros,
+            'NeedStdCConstantMacros': NeedStdCConstantMacros,
+            'NeedStdCFormatMacros': NeedStdCFormatMacros,
+        })
+
+        conf.env.AppendUnique(
+            CPPDEFINES=[
+                '__STDC_LIMIT_MACROS' if conf.NeedStdCLimitMacros() else '',
+                '__STDC_CONSTANT_MACROS' if conf.NeedStdCConstantMacros() else '',
+                '__STDC_FORMAT_MACROS' if conf.NeedStdCFormatMacros() else '',
+            ]
+        )
+
+        myenv = conf.Finish()
+
     # We set this with GCC on x86 platforms to work around
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052
     if myenv.ToolchainIs('gcc') and (env['TARGET_ARCH'] in ['i386', 'x86_64']):
@@ -4647,7 +4715,7 @@ if get_option('ninja') != 'disabled':
             env.FatalError("Use of ccache is mandatory with --ninja and icecream older than 1.2. You are running {}.".format(env['ICECREAM_VERSION']))
 
     ninja_builder = Tool("ninja")
-    env["NINJA_BUILDDIR"] = env.Dir("$BUILD_DIR/ninja")
+    env["NINJA_BUILDDIR"] = env.Dir("$NINJA_BUILDDIR")
     ninja_builder.generate(env)
 
     ninjaConf = Configure(env, help=False, custom_tests = {
@@ -4951,15 +5019,15 @@ env.AddPackageNameAlias(
 )
 
 env.AddPackageNameAlias(
-    component="shell",
+    component="jstestshell",
     role="runtime",
-    name="mongodb-shell",
+    name="mongodb-jstestshell",
 )
 
 env.AddPackageNameAlias(
-    component="shell",
+    component="jstestshell",
     role="debug",
-    name="mongodb-shell-debugsymbols",
+    name="mongodb-jstestshell-debugsymbols",
 )
 
 env.AddPackageNameAlias(

buildscripts/blackduck_hub.py

@@ -287,7 +287,9 @@ class VersionInfo:
             self.production_version = True
 
             # Abseil has an empty string for one version
-            if self.ver_str == "":
+            # Abseil thinks "~" is character to use in versions
+            # Geary thinks "+" is character to use in versions
+            if self.ver_str == "" or "~" in self.ver_str or "+" in self.ver_str:
                 self.production_version = False
                 return
 
@@ -570,7 +572,7 @@ curl --retry 5 -s -L https://detect.synopsys.com/detect.sh  | bash -s -- --black
 """.encode())
         fp.flush()
 
-        subprocess.call(["/bin/sh", fp.name])
+        subprocess.check_call(["/bin/sh", fp.name])
 
 
 def _scan_cmd_args(args):

buildscripts/collect_resource_info.py

@@ -18,7 +18,7 @@ from buildscripts.resmokelib import utils  # pylint: disable=wrong-import-positi
 
 
 def main():
-    """Main."""
+    """Collect system resources."""
     usage = "usage: %prog [options]"
     parser = optparse.OptionParser(description=__doc__, usage=usage)
     parser.add_option(

buildscripts/errorcodes.py

@@ -239,14 +239,15 @@ def read_error_codes(src_root='src/mongo'):
 
 
 def replace_bad_codes(errors, next_code_generator):  # pylint: disable=too-many-locals
-    """Modify C++ source files to replace invalid assertion codes.
+    """
+    Modify C++ source files to replace invalid assertion codes.
 
     For now, we only modify zero codes.
 
-    Args:
-        errors: list of AssertLocation
-        next_code_generator: generator -> int, next non-conflicting assertion code
+    :param errors: list of AssertLocation
+    :param next_code_generator: generator -> int, next non-conflicting assertion code
     """
+
     zero_errors = [e for e in errors if int(e.code) == 0]
     skip_errors = [e for e in errors if int(e.code) != 0]
 
@@ -296,7 +297,7 @@ def coerce_to_number(ticket_value):
 
 
 def main():
-    """Main."""
+    """Validate error codes."""
     parser = OptionParser(description=__doc__.strip())
     parser.add_option("--fix", dest="replace", action="store_true", default=False,
                       help="Fix zero codes in source files [default: %default]")

buildscripts/evergreen_task_timeout.py

@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
 """Determine the timeout value a task should use in evergreen."""
+from __future__ import annotations
 
 import argparse
 import math
 import os
+import shlex
 import sys
 from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Dict, List, Optional
-import shlex
 
 import inject
 import structlog
@@ -16,8 +17,8 @@ import yaml
 from pydantic import BaseModel
 from evergreen import EvergreenApi, RetryingEvergreenApi
 
-from buildscripts.task_generation.resmoke_proxy import ResmokeProxyService
 from buildscripts.ciconfig.evergreen import (EvergreenProjectConfig, parse_evergreen_file)
+from buildscripts.task_generation.resmoke_proxy import ResmokeProxyService
 from buildscripts.timeouts.timeout_service import (TimeoutParams, TimeoutService, TimeoutSettings)
 from buildscripts.util.cmdutils import enable_logging
 from buildscripts.util.taskname import determine_task_base_name
@@ -56,6 +57,18 @@ class TimeoutOverride(BaseModel):
     exec_timeout: Optional[int] = None
     idle_timeout: Optional[int] = None
 
+    @classmethod
+    def from_seconds(cls, task: str, exec_timeout_secs: Optional[float],
+                     idle_timeout_secs: Optional[float]) -> TimeoutOverride:
+        """Create an instance of an override from seconds."""
+        exec_timeout = exec_timeout_secs / 60 if exec_timeout_secs else None
+        idle_timeout = idle_timeout_secs / 60 if idle_timeout_secs else None
+        return cls(
+            task=task,
+            exec_timeout=exec_timeout,
+            idle_timeout=idle_timeout,
+        )
+
     def get_exec_timeout(self) -> Optional[timedelta]:
         """Get a timedelta of the exec timeout to use."""
         if self.exec_timeout is not None:
@@ -173,14 +186,16 @@ class TaskTimeoutOrchestrator:
 
         :param timeout_service: Service for calculating historic timeouts.
         :param timeout_overrides: Timeout overrides for specific tasks.
+        :param evg_project_config: Evergreen project configuration.
         """
         self.timeout_service = timeout_service
         self.timeout_overrides = timeout_overrides
         self.evg_project_config = evg_project_config
 
-    def determine_exec_timeout(
-            self, task_name: str, variant: str, idle_timeout: Optional[timedelta] = None,
-            exec_timeout: Optional[timedelta] = None, evg_alias: str = "") -> timedelta:
+    def determine_exec_timeout(self, task_name: str, variant: str,
+                               idle_timeout: Optional[timedelta] = None,
+                               exec_timeout: Optional[timedelta] = None, evg_alias: str = "",
+                               historic_timeout: Optional[timedelta] = None) -> timedelta:
         """
         Determine what exec timeout should be used.
 
@@ -189,9 +204,12 @@ class TaskTimeoutOrchestrator:
         :param idle_timeout: Idle timeout if specified.
         :param exec_timeout: Override to use for exec_timeout or 0 if no override.
         :param evg_alias: Evergreen alias running the task.
+        :param historic_timeout: Timeout determined by looking at previous task executions.
         :return: Exec timeout to use for running task.
         """
         determined_timeout = DEFAULT_NON_REQUIRED_BUILD_TIMEOUT
+        if historic_timeout is not None:
+            determined_timeout = historic_timeout
 
         override = self.timeout_overrides.lookup_exec_override(variant, task_name)
 
@@ -200,25 +218,26 @@ class TaskTimeoutOrchestrator:
                         exec_timeout_secs=exec_timeout.total_seconds())
             determined_timeout = exec_timeout
 
+        elif override is not None:
+            LOGGER.info("Overriding configured timeout", exec_timeout_secs=override.total_seconds())
+            determined_timeout = override
+
         elif task_name == UNITTEST_TASK and override is None:
             LOGGER.info("Overriding unittest timeout",
                         exec_timeout_secs=UNITTESTS_TIMEOUT.total_seconds())
             determined_timeout = UNITTESTS_TIMEOUT
 
+        elif _is_required_build_variant(
+                variant) and determined_timeout > DEFAULT_REQUIRED_BUILD_TIMEOUT:
+            LOGGER.info("Overriding required-builder timeout",
+                        exec_timeout_secs=DEFAULT_REQUIRED_BUILD_TIMEOUT.total_seconds())
+            determined_timeout = DEFAULT_REQUIRED_BUILD_TIMEOUT
+
         elif evg_alias == COMMIT_QUEUE_ALIAS:
             LOGGER.info("Overriding commit-queue timeout",
                         exec_timeout_secs=COMMIT_QUEUE_TIMEOUT.total_seconds())
             determined_timeout = COMMIT_QUEUE_TIMEOUT
 
-        elif override is not None:
-            LOGGER.info("Overriding configured timeout", exec_timeout_secs=override.total_seconds())
-            determined_timeout = override
-
-        elif _is_required_build_variant(variant):
-            LOGGER.info("Overriding required-builder timeout",
-                        exec_timeout_secs=DEFAULT_REQUIRED_BUILD_TIMEOUT.total_seconds())
-            determined_timeout = DEFAULT_REQUIRED_BUILD_TIMEOUT
-
         # The timeout needs to be at least as large as the idle timeout.
         if idle_timeout and determined_timeout.total_seconds() < idle_timeout.total_seconds():
             LOGGER.info("Making exec timeout as large as idle timeout",
@@ -228,16 +247,19 @@ class TaskTimeoutOrchestrator:
         return determined_timeout
 
     def determine_idle_timeout(self, task_name: str, variant: str,
-                               idle_timeout: Optional[timedelta] = None) -> Optional[timedelta]:
+                               idle_timeout: Optional[timedelta] = None,
+                               historic_timeout: Optional[timedelta] = None) -> Optional[timedelta]:
         """
         Determine what idle timeout should be used.
 
         :param task_name: Name of task being run.
         :param variant: Name of build variant being run.
         :param idle_timeout: Override to use for idle_timeout.
+        :param historic_timeout: Timeout determined by looking at previous task executions.
         :return: Idle timeout to use for running task.
         """
-        determined_timeout = None
+        determined_timeout = historic_timeout
+
         override = self.timeout_overrides.lookup_idle_override(variant, task_name)
 
         if idle_timeout and idle_timeout.total_seconds() != 0:
@@ -252,7 +274,7 @@ class TaskTimeoutOrchestrator:
         return determined_timeout
 
     def determine_historic_timeout(self, task: str, variant: str, suite_name: str,
-                                   exec_timeout_factor: Optional[float]) -> Optional[timedelta]:
+                                   exec_timeout_factor: Optional[float]) -> TimeoutOverride:
         """
         Calculate the timeout based on historic test results.
 
@@ -262,7 +284,7 @@ class TaskTimeoutOrchestrator:
         :param exec_timeout_factor: Scaling factor to use when determining timeout.
         """
         if suite_name in IGNORED_SUITES:
-            return None
+            return TimeoutOverride(task=task, exec_timeout=None, idle_timeout=None)
 
         timeout_params = TimeoutParams(
             evg_project="mongodb-mongo-master",
@@ -275,10 +297,12 @@ class TaskTimeoutOrchestrator:
         if timeout_estimate and timeout_estimate.is_specified():
             exec_timeout = timeout_estimate.calculate_task_timeout(
                 repeat_factor=1, scaling_factor=exec_timeout_factor)
-            if exec_timeout is not None:
-                LOGGER.info("Using historic based timeout", exec_timeout_secs=exec_timeout)
-                return timedelta(seconds=exec_timeout)
-        return None
+            idle_timeout = timeout_estimate.calculate_test_timeout(repeat_factor=1)
+            if exec_timeout is not None or idle_timeout is not None:
+                LOGGER.info("Getting historic based timeout", exec_timeout_secs=exec_timeout,
+                            idle_timeout_secs=idle_timeout)
+                return TimeoutOverride.from_seconds(task, exec_timeout, idle_timeout)
+        return TimeoutOverride(task=task, exec_timeout=None, idle_timeout=None)
 
     def is_build_variant_asan(self, build_variant: str) -> bool:
         """
@@ -305,14 +329,13 @@ class TaskTimeoutOrchestrator:
         :param suite_name: Name of evergreen suite being run.
         :param exec_timeout_factor: Scaling factor to use when determining timeout.
         """
-        idle_timeout = self.determine_idle_timeout(task, variant, cli_idle_timeout)
-        exec_timeout = self.determine_exec_timeout(task, variant, idle_timeout, cli_exec_timeout,
-                                                   evg_alias)
-
         historic_timeout = self.determine_historic_timeout(task, variant, suite_name,
                                                            exec_timeout_factor)
-        if historic_timeout:
-            exec_timeout = historic_timeout
+
+        idle_timeout = self.determine_idle_timeout(task, variant, cli_idle_timeout,
+                                                   historic_timeout.get_idle_timeout())
+        exec_timeout = self.determine_exec_timeout(task, variant, idle_timeout, cli_exec_timeout,
+                                                   evg_alias, historic_timeout.get_exec_timeout())
 
         output_timeout(exec_timeout, idle_timeout, outfile)
 

buildscripts/gdb/mongo.py

@@ -318,75 +318,100 @@ class DumpMongoDSessionCatalog(gdb.Command):
         else:
             lsids_to_print = [str(s['first']['_id']) for s in session_kv_pairs]
 
-        for sess_kv in session_kv_pairs:
-            # The Session is stored inside the SessionRuntimeInfo object.
-            session_runtime_info = get_unique_ptr(sess_kv['second']).dereference()  # pylint: disable=undefined-variable
-            session = session_runtime_info['session']
-            # TODO: Add a custom pretty printer for LogicalSessionId.
-            lsid_str = str(session['_sessionId']['_id'])
+        for session_kv in session_kv_pairs:
+            # The Session objects are stored inside the SessionRuntimeInfo object.
+            session_runtime_info = get_unique_ptr(session_kv['second']).dereference()  # pylint: disable=undefined-variable
+            parent_session = session_runtime_info['parentSession']
+            child_sessions = absl_get_nodes(session_runtime_info['childSessions'])  # pylint: disable=undefined-variable
+            lsid = str(parent_session['_sessionId']['_id'])
 
             # If we are only interested in a specific session, then we print out the entire Session
-            # object, to aid more detailed debugging.
-            if lsid_str == lsid_to_find:
-                print("SessionId", "=", lsid_str)
-                print(session)
+            # objects, to aid more detailed debugging.
+            if lsid == lsid_to_find:
+                self.dump_session_runtime_info(session_runtime_info)
+                print(parent_session)
+                for child_session_kv in child_sessions:
+                    child_session = child_session_kv['second']
+                    print(child_session)
                 # Terminate if this is the only session we care about.
                 break
 
             # Only print info for the necessary sessions.
-            if lsid_str not in lsids_to_print:
+            if lsid not in lsids_to_print:
                 continue
 
-            # If we are printing multiple sessions, we only print the most interesting fields from
-            # the Session object for the sake of efficiency. We print the session id string first so
-            # the session is easily identifiable.
-            print("Session (" + str(session.address) + "):")
-            print("SessionId", "=", lsid_str)
-            session_fields_to_print = ['_checkoutOpCtx', '_killsRequested']
-            for field in session_fields_to_print:
+            # If we are printing multiple sessions, we only print the most interesting fields for
+            # each Session object for the sake of efficiency.
+            self.dump_session_runtime_info(session_runtime_info)
+            self.dump_session(parent_session)
+            for child_session_kv in child_sessions:
+                child_session = child_session_kv['second']
+                self.dump_session(child_session)
+
+    @staticmethod
+    def dump_session_runtime_info(session_runtime_info):
+        """Dump the session runtime info."""
+
+        parent_session = session_runtime_info['parentSession']
+        # TODO: Add a custom pretty printer for LogicalSessionId.
+        lsid = str(parent_session['_sessionId']['_id'])[1:-1]
+        print("SessionId =", lsid)
+        fields_to_print = ['checkoutOpCtx', 'killsRequested']
+        for field in fields_to_print:
+            # Skip fields that aren't found on the object.
+            if field in get_field_names(session_runtime_info):
+                print(field, "=", session_runtime_info[field])
+            else:
+                print("Could not find field '%s' on the SessionRuntimeInfo object." % field)
+        print("")
+
+    @staticmethod
+    def dump_session(session):
+        """Dump the session."""
+
+        print("Session (" + str(session.address) + "):")
+        fields_to_print = ['_sessionId', '_numWaitingToCheckOut']
+        for field in fields_to_print:
+            # Skip fields that aren't found on the object.
+            if field in get_field_names(session):
+                print(field, "=", session[field])
+            else:
+                print("Could not find field '%s' on the SessionRuntimeInfo object." % field)
+
+        # Print the information from a TransactionParticipant if a session has one.
+        txn_part_dec = get_decoration(session, "TransactionParticipant")
+        if txn_part_dec:
+            # Only print the most interesting fields for debugging transactions issues. The
+            # TransactionParticipant class encapsulates internal state in two distinct
+            # structures: a 'PrivateState' type (stored in private field '_p') and an
+            # 'ObservableState' type (stored in private field '_o'). The information we care
+            # about here is all contained inside the 'ObservableState', so we extract fields
+            # from that object. If, in the future, we want to print fields from the
+            # 'PrivateState' object, we can inspect the TransactionParticipant's '_p' field.
+            txn_part = txn_part_dec[1]
+            txn_part_observable_state = txn_part['_o']
+            fields_to_print = ['txnState', 'activeTxnNumberAndRetryCounter']
+            print("TransactionParticipant (" + str(txn_part.address) + "):")
+            for field in fields_to_print:
                 # Skip fields that aren't found on the object.
-                if field in get_field_names(session):
-                    print(field, "=", session[field])
+                if field in get_field_names(txn_part_observable_state):
+                    print(field, "=", txn_part_observable_state[field])
                 else:
-                    print("Could not find field '%s' on the Session object." % field)
+                    print("Could not find field '%s' on the TransactionParticipant" % field)
 
-            # Print the information from a TransactionParticipant if a session has one. Otherwise
-            # we just print the session's id and nothing else.
-            txn_part_dec = get_decoration(session, "TransactionParticipant")
-            if txn_part_dec:
-                # Only print the most interesting fields for debugging transactions issues. The
-                # TransactionParticipant class encapsulates internal state in two distinct
-                # structures: a 'PrivateState' type (stored in private field '_p') and an
-                # 'ObservableState' type (stored in private field '_o'). The information we care
-                # about here is all contained inside the 'ObservableState', so we extract fields
-                # from that object. If, in the future, we want to print fields from the
-                # 'PrivateState' object, we can inspect the TransactionParticipant's '_p' field.
-                txn_part = txn_part_dec[1]
-                txn_part_observable_state = txn_part['_o']
-                fields_to_print = ['txnState', 'activeTxnNumber']
-                print("TransactionParticipant (" + str(txn_part.address) + "):")
-                for field in fields_to_print:
-                    # Skip fields that aren't found on the object.
-                    if field in get_field_names(txn_part_observable_state):
-                        print(field, "=", txn_part_observable_state[field])
-                    else:
-                        print("Could not find field '%s' on the TransactionParticipant" % field)
-
-                # The 'txnResourceStash' field is a boost::optional so we unpack it manually if it
-                # is non-empty. We are only interested in its Locker object for now. TODO: Load the
-                # boost pretty printers so the object will be printed clearly by default, without
-                # the need for special unpacking.
-                val = get_boost_optional(txn_part_observable_state['txnResourceStash'])
-                if val:
-                    locker_addr = get_unique_ptr(val["_locker"])  # pylint: disable=undefined-variable
-                    locker_obj = locker_addr.dereference().cast(
-                        gdb.lookup_type("mongo::LockerImpl"))
-                    print('txnResourceStash._locker', "@", locker_addr)
-                    print("txnResourceStash._locker._id", "=", locker_obj["_id"])
-                else:
-                    print('txnResourceStash', "=", None)
-            # Separate sessions by a newline.
-            print("")
+            # The 'txnResourceStash' field is a boost::optional so we unpack it manually if it
+            # is non-empty. We are only interested in its Locker object for now. TODO: Load the
+            # boost pretty printers so the object will be printed clearly by default, without
+            # the need for special unpacking.
+            val = get_boost_optional(txn_part_observable_state['txnResourceStash'])
+            if val:
+                locker_addr = get_unique_ptr(val["_locker"])  # pylint: disable=undefined-variable
+                locker_obj = locker_addr.dereference().cast(gdb.lookup_type("mongo::LockerImpl"))
+                print('txnResourceStash._locker', "@", locker_addr)
+                print("txnResourceStash._locker._id", "=", locker_obj["_id"])
+            else:
+                print('txnResourceStash', "=", None)
+        print("")
 
 
 # Register command
@@ -536,39 +561,51 @@ class MongoDBDumpRecoveryUnits(gdb.Command):
 
         # Dump stashed recovery unit info for each session in a mongod process
         for session_kv in get_session_kv_pairs():
-            session_runtime_info = get_unique_ptr(session_kv["second"]).dereference()  # pylint: disable=undefined-variable
-            session = session_runtime_info["session"]
+            # The Session objects are stored inside the SessionRuntimeInfo object.
+            session_runtime_info = get_unique_ptr(session_kv['second']).dereference()  # pylint: disable=undefined-variable
+            parent_session = session_runtime_info['parentSession']
+            child_sessions = absl_get_nodes(session_runtime_info['childSessions'])  # pylint: disable=undefined-variable
 
-            # Prepare structured output doc
-            session_lsid = str(session["_sessionId"]["_id"])[1:-1]
-            txn_participant_dec = get_decoration(session, "TransactionParticipant")
-            output_doc = {"session": session_lsid, "txnResourceStash": "0x0"}
-
-            recovery_unit_handle = None
-            recovery_unit = None
-            if txn_participant_dec:
-                txn_participant_observable_state = txn_participant_dec[1]["_o"]
-                txn_resource_stash = get_boost_optional(
-                    txn_participant_observable_state["txnResourceStash"])
-
-                if txn_resource_stash:
-                    output_doc["txnResourceStash"] = str(txn_resource_stash.address)
-                    recovery_unit_handle = get_unique_ptr(txn_resource_stash["_recoveryUnit"])  # pylint: disable=undefined-variable
-                    # By default, cast the recovery unit as "mongo::WiredTigerRecoveryUnit"
-                    recovery_unit = recovery_unit_handle.dereference().cast(
-                        gdb.lookup_type(recovery_unit_impl_type))
-
-            output_doc["recoveryUnit"] = hex(recovery_unit_handle) if recovery_unit else "0x0"
-            wt_session = get_wt_session(recovery_unit, recovery_unit_impl_type)
-            if wt_session:
-                output_doc["WT_SESSION"] = hex(wt_session)
-            print(json.dumps(output_doc))
-            if recovery_unit:
-                print(recovery_unit)
+            MongoDBDumpRecoveryUnits.dump_session(parent_session, recovery_unit_impl_type)
+            for child_session_kv in child_sessions:
+                child_session = child_session_kv['second']
+                MongoDBDumpRecoveryUnits.dump_session(child_session, recovery_unit_impl_type)
 
         if enabled_at_start:
             gdb.execute("set print static-members on")
 
+    @staticmethod
+    def dump_session(session, recovery_unit_impl_type):
+        """Dump the session."""
+
+        # Prepare structured output doc
+        lsid = session["_sessionId"]
+        output_doc = {"session": str(lsid["_id"])[1:-1], "txnResourceStash": "0x0"}
+        txn_participant_dec = get_decoration(session, "TransactionParticipant")
+        recovery_unit_handle = None
+        recovery_unit = None
+
+        if txn_participant_dec:
+            txn_participant_observable_state = txn_participant_dec[1]["_o"]
+            txn_resource_stash = get_boost_optional(
+                txn_participant_observable_state["txnResourceStash"])
+            if txn_resource_stash:
+                output_doc["txnResourceStash"] = str(txn_resource_stash.address)
+                recovery_unit_handle = get_unique_ptr(txn_resource_stash["_recoveryUnit"])  # pylint: disable=undefined-variable
+                # By default, cast the recovery unit as "mongo::WiredTigerRecoveryUnit"
+                recovery_unit = recovery_unit_handle.dereference().cast(
+                    gdb.lookup_type(recovery_unit_impl_type))
+
+        output_doc["recoveryUnit"] = hex(recovery_unit_handle) if recovery_unit else "0x0"
+        wt_session = get_wt_session(recovery_unit, recovery_unit_impl_type)
+        if wt_session:
+            output_doc["WT_SESSION"] = hex(wt_session)
+
+        print(json.dumps(output_doc))
+        print(lsid)
+        if recovery_unit:
+            print(recovery_unit)
+
 
 # Register command
 MongoDBDumpRecoveryUnits()
@@ -726,7 +763,7 @@ class MongoDBJavaScriptStack(gdb.Command):
     """Print the JavaScript stack from a MongoDB process."""
 
     # Looking to test your changes to this? Really easy!
-    # 1. install-core to build the mongo shell binary (mongo)
+    # 1. install-jstestshell to build the mongo shell binary (mongo)
     # 2. launch it: ./path/to/bin/mongo --nodb
     # 3. in the shell, run: sleep(99999999999). (do not use --eval)
     # 4. ps ax | grep nodb to find the PID

buildscripts/gdb/mongo_printers.py

@@ -579,6 +579,7 @@ def find_match_brackets(search, opening='<', closing='>'):
     Example:
         'Foo<T>::iterator<U>''
         returns 5
+
     """
     index = search.find(opening)
     if index == -1:

buildscripts/generate_compile_expansions.py

@@ -61,8 +61,8 @@ def generate_version_expansions():
             raise ValueError("Unable to parse version from stdin and no version.json provided")
 
     if version_parts[0]:
-        expansions["suffix"] = "latest"
-        expansions["src_suffix"] = "latest"
+        expansions["suffix"] = "v6.0-latest"
+        expansions["src_suffix"] = "v6.0-latest"
         expansions["is_release"] = "false"
     else:
         expansions["suffix"] = version_line

buildscripts/generate_compile_expansions_shared_cache.py

@@ -61,8 +61,8 @@ def generate_version_expansions():
             raise ValueError("Unable to parse version from stdin and no version.json provided")
 
     if version_parts[0]:
-        expansions["suffix"] = "latest"
-        expansions["src_suffix"] = "latest"
+        expansions["suffix"] = "v6.0-latest"
+        expansions["src_suffix"] = "v6.0-latest"
         expansions["is_release"] = "false"
     else:
         expansions["suffix"] = version_line

buildscripts/idl/check_stable_api_commands_have_idl_definitions.py

@@ -178,6 +178,7 @@ def main():
 
         def __init__(self):
             self.INSTALL_DIR = args.install_dir  # pylint: disable=invalid-name
+            self.command = ""
 
     # pylint: disable=protected-access
     configure_resmoke._update_config_vars(FakeArgs())

buildscripts/idl/idl/bson.py

@@ -72,6 +72,7 @@ _BINDATA_SUBTYPE = {
     # },
     "uuid": {'scalar': True, 'bindata_enum': 'newUUID'},
     "md5": {'scalar': True, 'bindata_enum': 'MD5Type'},
+    "encrypt": {'scalar': True, 'bindata_enum': 'Encrypt'},
 }
 
 

buildscripts/idl/idl/errors.py

@@ -37,7 +37,6 @@ import inspect
 import os
 import sys
 from typing import List, Union
-from yaml import nodes
 import yaml
 
 from . import common

buildscripts/idl/idl_check_compatibility.py

@@ -707,7 +707,10 @@ def check_param_or_command_type_recursive(ctxt: IDLCompatibilityContext,
             # Check that new variant types are a superset of old variant types.
             for old_variant_type in old_variant_types:
                 for new_variant_type in new_variant_types:
-                    if old_variant_type.name == new_variant_type.name:
+                    # object->object_owned serialize to the same bson type. object_owned->object is
+                    # not always safe so we only limit this special case to object->object_owned.
+                    if (old_variant_type.name == "object" and new_variant_type.name == "object_owned") or \
+                        old_variant_type.name == new_variant_type.name:
                         # Check that the old and new version of each variant type is also compatible.
                         old = FieldCompatibility(old_variant_type, old_field.idl_file,
                                                  old_field.idl_file_path, old_field.unstable,

buildscripts/linter/git_base.py

@@ -236,6 +236,7 @@ class GitException(Exception):
         process_args: a list containing the git command and arguments (includes 'git' as its first
             element) that were run, if any.
         stderr: the error output of the git command.
+
     """
 
     def __init__(  # pylint: disable=too-many-arguments
@@ -258,6 +259,7 @@ class GitCommandResult(object):
         returncode: the return code.
         stdout: the output of the command.
         stderr: the error output of the command.
+
     """
 
     def __init__(  # pylint: disable=too-many-arguments

buildscripts/linter/parallel.py

@@ -9,7 +9,11 @@ from typing import Any, Callable, List
 
 def parallel_process(items, func):
     # type: (List[Any], Callable[[Any], bool]) -> bool
-    """Run a set of work items to completion and wait."""
+    """
+    Run a set of work items to completion and wait.
+
+    :returns whether all tasks were successful.
+    """
     try:
         cpus = cpu_count()
     except NotImplementedError:
@@ -17,20 +21,16 @@ def parallel_process(items, func):
 
     task_queue = queue.Queue()  # type: queue.Queue
 
-    # Use a list so that worker function will capture this variable
-    pp_event = threading.Event()
-    pp_result = [True]
-    pp_lock = threading.Lock()
+    has_failure_event = threading.Event()
 
     def worker():
         # type: () -> None
         """Worker thread to process work items in parallel."""
-        while not pp_event.is_set():
+        while True:
             try:
                 item = task_queue.get_nowait()
             except queue.Empty:
                 # if the queue is empty, exit the worker thread
-                pp_event.set()
                 return
 
             try:
@@ -39,13 +39,8 @@ def parallel_process(items, func):
                 # Tell the queue we finished with the item
                 task_queue.task_done()
 
-            # Return early if we fail, and signal we are done
             if not ret:
-                with pp_lock:
-                    pp_result[0] = False
-
-                pp_event.set()
-                return
+                has_failure_event.set()
 
     # Enqueue all the work we want to process
     for item in items:
@@ -62,10 +57,10 @@ def parallel_process(items, func):
 
     # Wait for the threads to finish
     # Loop with a timeout so that we can process Ctrl-C interrupts
-    while not pp_event.wait(1):
+    while not queue.Empty:
         time.sleep(1)
 
     for thread in threads:
         thread.join()
 
-    return pp_result[0]
+    return not has_failure_event.is_set()

buildscripts/linter/pydocstyle.py

@@ -11,7 +11,7 @@ class PyDocstyleLinter(base.LinterBase):
     def __init__(self):
         # type: () -> None
         """Create a pydocstyle linter."""
-        super(PyDocstyleLinter, self).__init__("pydocstyle", "2.1.1")
+        super(PyDocstyleLinter, self).__init__("pydocstyle", "6.1.1")
 
     def get_lint_version_cmd_args(self):
         # type: () -> List[str]

buildscripts/package_test/kitchen.legacy.yml

@@ -41,21 +41,6 @@ platforms:
       instance_type: c6g.medium
     transport:
       username: ec2-user
-  - name: debian71-x86-64
-    driver:
-      image_id: ami-4b124a22
-    transport:
-      username: admin
-  - name: debian81-x86-64
-    driver:
-      image_id: ami-896d85e2
-    transport:
-      username: admin
-  - name: debian92-x86-64
-    driver:
-      image_id: ami-71b7750b
-    transport:
-      username: admin
   - name: debian10-x86-64
     driver:
       image_id: ami-0dedf6a6502877301

buildscripts/package_test/kitchen.yml

@@ -23,7 +23,7 @@ provisioner:
   name: chef_zero
   log_level: info
   product_name: cinc
-  product_version: 16.7.61
+  product_version: 17.9.52
   download_url: https://omnitruck.cinc.sh/install.sh
 
 platforms:
@@ -34,7 +34,7 @@ platforms:
       username: ec2-user
   - name: amazon2-x86-64
     driver:
-      image_id: ami-428aa838
+      image_id: ami-02013ed1a71752ea7
     transport:
       username: ec2-user
   - name: amazon2-arm64
@@ -53,11 +53,6 @@ platforms:
       image_id: ami-896d85e2
     transport:
       username: admin
-  - name: debian92-x86-64
-    driver:
-      image_id: ami-71b7750b
-    transport:
-      username: admin
   - name: debian10-x86-64
     driver:
       image_id: ami-0dedf6a6502877301
@@ -70,7 +65,7 @@ platforms:
       username: admin
   - name: rhel70-x86-64
     driver:
-      image_id: ami-2051294a
+      image_id: ami-0051b1b2c5a166c8c
     transport:
       username: root
   - name: rhel80-x86-64

buildscripts/package_test/recipes/install_mongodb.rb

@@ -51,11 +51,21 @@ if platform_family? 'debian'
   ENV['DEBIAN_FRONTEND'] = 'noninteractive'
   package 'openssl'
 
-  # the ubuntu 16.04 image does not have some dependencies installed by default
+  # the ubuntu image does not have some dependencies installed by default
   # and it is required for the install_compass script
-  execute 'install dependencies' do
-    command 'apt-get install -y python libsasl2-modules-gssapi-mit'
-    live_stream true
+  if node['platform'] == 'ubuntu' and node['platform_version'] == '20.04'
+    execute 'install dependencies ubuntu 20.04' do
+      command 'apt-get install -y python3 libsasl2-modules-gssapi-mit'
+      live_stream true
+    end
+    link '/usr/bin/python' do
+      to '/usr/bin/python3'
+    end
+  else
+    execute 'install dependencies' do
+      command 'apt-get install -y python libsasl2-modules-gssapi-mit'
+      live_stream true
+    end
   end
 
   # dpkg returns 1 if dependencies are not satisfied, which they will not be
@@ -82,12 +92,6 @@ if platform_family? 'debian'
     command 'apt update && apt -y -f install'
     live_stream true
   end
-
-  execute 'install mongo shell' do
-    command 'dpkg -i `find . -name "*shell*.deb"`'
-    live_stream true
-    cwd homedir
-  end
 end
 
 if platform_family? 'rhel' or platform_family? 'amazon'
@@ -108,12 +112,6 @@ if platform_family? 'rhel' or platform_family? 'amazon'
     live_stream true
     cwd homedir
   end
-
-  execute 'install mongo shell' do
-    command 'yum install -y `find . -name "*shell*.rpm"`'
-    live_stream true
-    cwd homedir
-  end
 end
 
 if platform_family? 'suse'
@@ -145,32 +143,4 @@ if platform_family? 'suse'
     live_stream true
     cwd homedir
   end
-
-  execute 'install mongo' do
-    command 'zypper --no-gpg-checks -n install `find . -name "*shell*.rpm"`'
-    live_stream true
-    cwd homedir
-  end
-end
-
-inspec_wait = <<HEREDOC
-#!/bin/bash -x
-ulimit -v unlimited
-for i in {1..60}
-do
-  mongo --eval "db.smoke.insert({answer: 42})"
-  if [ $? -eq 0 ]
-  then
-    exit 0
-  else
-    echo "sleeping"
-    sleep 1
-  fi
-done
-exit 1
-HEREDOC
-
-file '/inspec_wait.sh' do
-  content inspec_wait
-  mode '0755'
 end

buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb

@@ -78,11 +78,6 @@ else
   end
 end
 
-# wait to make sure mongod is ready
-describe command("/inspec_wait.sh") do
-  its('exit_status') { should eq 0 }
-end
-
 ############################################################
 # This section verifies files, directories, and users
 # - files and directories exist and have correct attributes
@@ -199,23 +194,6 @@ ulimits.each do |limit, value|
   end
 end
 
-############################################################
-# This section verifies reads and writes.
-# - insert a document into the database
-# - verify that findOne() returns a matching document
-############################################################
-
-describe command('sh -c "ulimit -v unlimited && mongo --eval \"db.smoke.insert({answer: 42})\""') do
-  its('exit_status') { should eq 0 }
-  its('stdout') { should match(/.+WriteResult\({ "nInserted" : 1 }\).+/m) }
-end
-
-# read a document from the db
-describe command('sh -c "ulimit -v unlimited && mongo --eval \"db.smoke.findOne()\""') do
-  its('exit_status') { should eq 0 }
-  its('stdout') { should match(/.+"answer" : 42.+/m) }
-end
-
 ############################################################
 # This section verifies uninstall.
 ############################################################

buildscripts/resmokeconfig/fully_disabled_feature_flags.yml

@@ -8,3 +8,8 @@
 # Disable featureFlagRequireTenantID until all paths pass tenant id to TenantNamespace
 # and TenantDatabase constructors.
 - featureFlagRequireTenantID
+- featureFlagSbePlanCache
+# This flag exists to help users in managed environments that upgraded to 6.0 before 6.0.0-rc8 was
+# released create the transactions collection index and is only meant to be enabled adhoc, so only
+# its targeted tests should enable it.
+- featureFlagAlwaysCreateConfigTransactionsPartialIndexOnStepUp

buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml

@@ -190,16 +190,6 @@ evergreen_buildvariants:
     platform: suse15
     architecture: x86_64
 
-  - name: debian92
-    edition: targeted
-    platform: debian92
-    architecture: x86_64
-
-  - name: enterprise-debian92-64
-    edition: enterprise
-    platform: debian92
-    architecture: x86_64
-
   - name: debian10
     edition: targeted
     platform: debian10

buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Don't run these tests as transactions can only run on primaries.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in causally_consistent_jscore_txns_passthrough.yml.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml

@@ -12,6 +12,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   - jstests/core/txns/**/*.js
   # Skip any tests that run with auth explicitly.

buildscripts/resmokeconfig/suites/causally_consistent_read_concern_snapshot_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Only the first command in a transaction allows readConcern and this suite only tests
   # non-transaction snapshot reads.

buildscripts/resmokeconfig/suites/change_streams_downgrade.yml

@@ -4,6 +4,8 @@ test_kind: multi_stmt_txn_passthrough
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests run in the jscore_txn passthrough suites.
   - jstests/core/txns/**/*.js
@@ -147,7 +149,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/change_streams_per_shard_cursor_passthrough.yml

@@ -3,6 +3,9 @@ test_kind: js_test
 selector:
   roots:
   - jstests/change_streams/**/*.js
+  exclude_files:
+  # Expects a change stream cursor to be open on each of 2 shards.
+  - jstests/change_streams/projection_fakes_internal_event.js
   exclude_with_any_tags:
   ##
   # The next tags correspond to the special errors thrown by the

buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml

@@ -5,6 +5,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
 
   # Assumes the _id index is real.

buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml

@@ -23,6 +23,7 @@ selector:
 
   # $lookup and $graphLookup are not supported on sharded collections with transactions.
   - jstests/concurrency/fsm_workloads/agg_graph_lookup.js
+  - jstests/concurrency/fsm_workloads/agg_lookup.js
   - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js
 
   # Disabled due to MongoDB restrictions and/or workload restrictions

buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml

@@ -23,6 +23,7 @@ selector:
 
   # $lookup and $graphLookup are not supported on sharded collections with transactions.
   - jstests/concurrency/fsm_workloads/agg_graph_lookup.js
+  - jstests/concurrency/fsm_workloads/agg_lookup.js
   - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js
 
   # Disabled due to MongoDB restrictions and/or workload restrictions

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml

@@ -23,6 +23,7 @@ selector:
 
   # $lookup and $graphLookup are not supported on sharded collections with transactions.
   - jstests/concurrency/fsm_workloads/agg_graph_lookup.js
+  - jstests/concurrency/fsm_workloads/agg_lookup.js
   - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js
 
   # Disabled due to MongoDB restrictions and/or workload restrictions

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml

@@ -28,6 +28,7 @@ selector:
 
   # $lookup and $graphLookup are not supported on sharded collections with transactions.
   - jstests/concurrency/fsm_workloads/agg_graph_lookup.js
+  - jstests/concurrency/fsm_workloads/agg_lookup.js
   - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js
 
   # Disabled because MapReduce can lose cursors if the primary goes down during the operation.

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml

@@ -28,6 +28,7 @@ selector:
 
   # $lookup and $graphLookup are not supported on sharded collections with transactions.
   - jstests/concurrency/fsm_workloads/agg_graph_lookup.js
+  - jstests/concurrency/fsm_workloads/agg_lookup.js
   - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js
 
   # Disabled because MapReduce can lose cursors if the primary goes down during the operation.

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml

@@ -23,6 +23,7 @@ selector:
 
   # $lookup and $graphLookup are not supported on sharded collections with transactions.
   - jstests/concurrency/fsm_workloads/agg_graph_lookup.js
+  - jstests/concurrency/fsm_workloads/agg_lookup.js
   - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js
 
   # Disabled due to MongoDB restrictions and/or workload restrictions
@@ -129,6 +130,12 @@ selector:
   # for dbCheck. TODO (SERVER-63951): Remove this exclusion.
   - jstests/concurrency/fsm_workloads/create_collection_and_view.js
 
+  # This suite runs the RunDBCheckInBackground hook and the dbCheck command generates oplog entries
+  # but those oplog entries are not supported by resharding.
+  # TODO (SERVER-66011): Enable internal_transactions_resharding.js in the
+  # concurrency_sharded_multi_stmt_txn_with_balancer suite
+  - jstests/concurrency/fsm_workloads/internal_transactions_resharding.js
+
 
   exclude_with_any_tags:
   - assumes_balancer_off

buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml

@@ -28,6 +28,7 @@ selector:
 
   # $lookup and $graphLookup are not supported on sharded collections with transactions.
   - jstests/concurrency/fsm_workloads/agg_graph_lookup.js
+  - jstests/concurrency/fsm_workloads/agg_lookup.js
   - jstests/concurrency/fsm_workloads/view_catalog_cycle_lookup.js
 
   # Disabled due to MongoDB restrictions and/or workload restrictions

buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml

@@ -36,6 +36,8 @@ selector:
   # the error response from the op being killed.
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
 
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.

buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml

@@ -36,6 +36,8 @@ selector:
   # the error response from the op being killed.
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
 
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.

buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml

@@ -36,6 +36,8 @@ selector:
   # the error response from the op being killed.
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
   - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
 
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.

buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml

@@ -6,6 +6,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   - jstests/core_standalone/**/*.js
   exclude_files:
   # Transactions are not supported on MongoDB standalone nodes, so we do not run these tests in the

buildscripts/resmokeconfig/suites/cwrwc_rc_majority_passthrough.yml

@@ -6,6 +6,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions only a readConcern argument on the first command.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/fle2_high_cardinality.yml

@@ -0,0 +1,32 @@
+test_kind: js_test
+selector:
+  roots:
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
+  - src/mongo/db/modules/*/jstests/fle2/query/*.js
+  exclude_with_any_tags:
+  # Not compatible with tests the expect fle to always using $in in queries,
+  # i.e. verify explain output
+  - requires_fle_in_always
+
+executor:
+  archive:
+    hooks:
+      - ValidateCollections
+  config:
+    shell_options:
+      eval: "testingReplication = true; testingFLESharding = false;"
+  hooks:
+  # We don't execute dbHash or oplog consistency checks since there is only a single replica set
+  # node.
+  - class: ValidateCollections
+  - class: CleanEveryN
+    n: 20
+  fixture:
+    class: ReplicaSetFixture
+    mongod_options:
+      set_parameters:
+        enableTestCommands: 1
+        internalQueryFLEAlwaysUseHighCardinalityMode: 1
+    # Use a 2-node replica set.
+    num_nodes: 2

buildscripts/resmokeconfig/suites/fle2_sharding_high_cardinality.yml

@@ -0,0 +1,37 @@
+test_kind: js_test
+selector:
+  roots:
+  - jstests/fle2/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
+  - src/mongo/db/modules/*/jstests/fle2/query/*.js
+  exclude_with_any_tags:
+  # Not compatible with tests the expect fle to always using $in in queries,
+  # i.e. verify explain output
+  - requires_fle_in_always
+
+executor:
+  archive:
+    hooks:
+      - CheckReplDBHash
+      - ValidateCollections
+  config:
+    shell_options:
+      eval: "testingReplication = false; testingFLESharding = true;"
+  hooks:
+  - class: CheckReplDBHash
+  - class: ValidateCollections
+  - class: CleanEveryN
+    n: 20
+  fixture:
+    class: ShardedClusterFixture
+    mongos_options:
+      set_parameters:
+        enableTestCommands: 1
+        internalQueryFLEAlwaysUseHighCardinalityMode: 1
+    mongod_options:
+      set_parameters:
+        enableTestCommands: 1
+        internalQueryFLEAlwaysUseHighCardinalityMode: 1
+    num_rs_nodes_per_shard: 2
+    enable_sharding:
+    - test

buildscripts/resmokeconfig/suites/jstestfuzz.yml

@@ -20,7 +20,6 @@ executor:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
           skipValidationOnNamespaceNotFound: false
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: MongoDFixture
     mongod_options:

buildscripts/resmokeconfig/suites/jstestfuzz_interrupt.yml

@@ -24,7 +24,6 @@ executor:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
           skipValidationOnNamespaceNotFound: false
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: MongoDFixture
     mongod_options:

buildscripts/resmokeconfig/suites/jstestfuzz_interrupt_replication.yml

@@ -34,7 +34,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ReplicaSetFixture
     mongod_options:

buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml

@@ -34,7 +34,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ReplicaSetFixture
     mongod_options:

buildscripts/resmokeconfig/suites/jstestfuzz_replication_continuous_stepdown.yml

@@ -32,7 +32,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ReplicaSetFixture
     mongod_options:

buildscripts/resmokeconfig/suites/jstestfuzz_replication_session.yml

@@ -31,7 +31,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ReplicaSetFixture
     mongod_options:

buildscripts/resmokeconfig/suites/jstestfuzz_replication_write_conflicts.yml

@@ -26,7 +26,6 @@ executor:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
           skipValidationOnNamespaceNotFound: false
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ReplicaSetFixture
     mongod_options:

buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml

@@ -29,7 +29,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/jstestfuzz_sharded_causal_consistency.yml

@@ -29,7 +29,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/jstestfuzz_sharded_continuous_stepdown.yml

@@ -35,7 +35,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/jstestfuzz_sharded_session.yml

@@ -26,7 +26,6 @@ executor:
       global_vars:
         TestData:
           skipValidationOnInvalidViewDefinitions: true
-          forceValidationWithFeatureCompatibilityVersion: latestFCV
   fixture:
     class: ShardedClusterFixture
     mongos_options:

buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
@@ -12,7 +14,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same

buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
@@ -12,7 +14,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same

buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
@@ -12,7 +14,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same

buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # The set_param1.js test attempts to compare the response from running the {getParameter: "*"}
   # command multiple times, which may observe the change to the "transactionLifetimeLimitSeconds"
@@ -12,7 +14,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal
   # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same

buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in logical_session_cache_sharding_100ms_refresh_jscore_txns_passthrough.yml.
   - jstests/core/txns/**/*.js
@@ -55,7 +57,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.

buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in logical_session_cache_sharding_100ms_refresh_jscore_txns_passthrough.yml.
   - jstests/core/txns/**/*.js
@@ -55,7 +57,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.

buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in logical_session_cache_sharding_100ms_refresh_jscore_txns_passthrough.yml.
   - jstests/core/txns/**/*.js
@@ -55,7 +57,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.

buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in logical_session_cache_sharding_100ms_refresh_jscore_txns_passthrough.yml.
   - jstests/core/txns/**/*.js
@@ -55,7 +57,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # TODO: Remove after fixing SERVER-29449. executionStats.nReturned is incorrect for sharded
   # queries with a limit or for distinct commands.

buildscripts/resmokeconfig/suites/logical_session_cache_standalone_100ms_refresh_jscore_passthrough.yml

@@ -13,7 +13,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.

buildscripts/resmokeconfig/suites/logical_session_cache_standalone_10sec_refresh_jscore_passthrough.yml

@@ -13,7 +13,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.

buildscripts/resmokeconfig/suites/logical_session_cache_standalone_1sec_refresh_jscore_passthrough.yml

@@ -13,7 +13,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.

buildscripts/resmokeconfig/suites/logical_session_cache_standalone_default_refresh_jscore_passthrough.yml

@@ -13,7 +13,6 @@ selector:
   # can be triggered deterministically.
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
   # These tests verify that an expected number of update operations were tracked in the server
   # status metrics, but the logical session cache refresh causes additional updates to be recorded.

buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml

@@ -151,7 +151,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml

@@ -146,7 +146,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml

@@ -147,7 +147,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml

@@ -159,7 +159,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/read_concern_majority_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions only a readConcern argument on the first command.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/replica_sets_api_version_jscore_passthrough.yml

@@ -5,6 +5,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # This test initiates a txn with API parameters, but runs txn-continuing commands in a separate
   # Thread object. Since those commands will not have API parameters appended, they will fail due

buildscripts/resmokeconfig/suites/replica_sets_fcbis_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Tests that query the system.profile collection cannot run in this suite since an initial sync
   # may insert unexpected operations into the profile collection.

buildscripts/resmokeconfig/suites/replica_sets_initsync_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Tests that query the system.profile collection cannot run in this suite since an initial sync
   # may insert unexpected operations into the profile collection.

buildscripts/resmokeconfig/suites/replica_sets_initsync_static_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Duplicate namespace may cause cloner to try and clone view instead of collection
   - jstests/core/views/duplicate_ns.js

buildscripts/resmokeconfig/suites/replica_sets_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests change the transactionLifetimeLimitSeconds server parameter which conflicts with how
   # the CheckReplDBHashInBackground hook doesn't want transactions to be reaped while it is running.

buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml

@@ -96,7 +96,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $indexStats

buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml

@@ -87,7 +87,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml

@@ -86,7 +86,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml

@@ -84,7 +84,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $collStats

buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_passthrough.yml

@@ -7,6 +7,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).

buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml

@@ -7,6 +7,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).

buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).

buildscripts/resmokeconfig/suites/replica_sets_update_v1_oplog_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests change the transactionLifetimeLimitSeconds server parameter which conflicts with how
   # the CheckReplDBHashInBackground hook doesn't want transactions to be reaped while it is running.

buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).

buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).

buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).

buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml

@@ -5,6 +5,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in sharded_causally_consistent_jscore_txns_passthrough.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml

@@ -5,6 +5,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in sharded_causally_consistent_jscore_txns_passthrough.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests run in the jscore_txn passthrough suites.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml

@@ -120,7 +120,6 @@ selector:
   # $listSessions
   - jstests/core/list_all_local_sessions.js
   - jstests/core/list_all_sessions.js
-  - jstests/core/list_local_sessions.js
   - jstests/core/list_sessions.js
 
   # $indexStats

buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).

buildscripts/resmokeconfig/suites/sharding_api_version_jscore_passthrough.yml

@@ -5,6 +5,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
 
   exclude_files:
   # This test initiates a txn with API parameters, but runs txn-continuing commands in a separate

buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml

@@ -11,6 +11,12 @@ selector:
   - jstests/sharding/query/*[aA]uth*.js
   - jstests/sharding/change_streams/*[aA]uth*.js
   - jstests/sharding/internal_txns/internal_client_restrictions.js
+  - jstests/sharding/internal_txns/non_retryable_writes_during_migration.js
+  - jstests/sharding/internal_txns/retry_on_transient_error_validation.js
+  - jstests/sharding/internal_txns/retryable_findAndModify_during_migration_oplog.js
+  - jstests/sharding/internal_txns/retryable_findAndModify_during_migration_side_coll.js
+  - jstests/sharding/internal_txns/retryable_writes_aborted_during_migration.js
+  - jstests/sharding/internal_txns/retryable_writes_committed_during_migration.js
 
   - jstests/sharding/localhostAuthBypass.js
   - jstests/sharding/kill_sessions.js

buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in sharded_jscore_txns.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/sharding_opportunistic_secondary_targeting.yml

@@ -0,0 +1,16 @@
+test_kind: js_test
+
+selector:
+  roots:
+  - jstests/sharding/**/*.js
+  exclude_files:
+  - jstests/sharding/**/libs/**/*.js
+
+executor:
+  config:
+    shell_options:
+      nodb: ''
+      global_vars:
+        TestData:
+          setParametersMongos:
+            opportunisticSecondaryTargeting: true

buildscripts/resmokeconfig/suites/sharding_update_v1_oplog_jscore_passthrough.yml

@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # These tests are run in sharded_jscore_txns.
   - jstests/core/txns/**/*.js

buildscripts/resmokeconfig/suites/ssl.yml

@@ -4,9 +4,6 @@ selector:
   roots:
   - jstests/ssl/*.js
   - src/mongo/db/modules/*/jstests/fips/*.js
-  exclude_files:
-  # TODO SERVER-63155 Re-enable this test.
-  - jstests/ssl/ssl_cert_selector_apple.js
 
 # ssl tests start their own mongod's.
 executor: