SERVER-67076 Add missing early return in DocumentSourceFindAndModifyImageLookup

3 files changed, 3 insertions, 14 deletions

diff --git a/jstests/concurrency/fsm_workloads/internal_transactions_resharding.js b/jstests/concurrency/fsm_workloads/internal_transactions_resharding.js
index 23fa3fcc77e..31c6e3df3b8 100644
--- a/jstests/concurrency/fsm_workloads/internal_transactions_resharding.js
+++ b/jstests/concurrency/fsm_workloads/internal_transactions_resharding.js
@@ -26,10 +26,6 @@ var $config = extendWorkload($config, function($config, $super) {
     $config.data.currentShardKeyIndex = -1;
     $config.data.reshardingCount = 0;
 
-    // TODO SERVER-67076: Investigate segfault in resharding image collection agg stage with
-    // concurrent reaps.
-    $config.data.overrideReapThreshold = false;
-
     $config.data.getQueryForDocument = function getQueryForDocument(doc) {
         // The query for a write command against a sharded collection must contain the shard key.
         const query = $super.data.getQueryForDocument.apply(this, arguments);
diff --git a/jstests/concurrency/fsm_workloads/internal_transactions_sharded.js b/jstests/concurrency/fsm_workloads/internal_transactions_sharded.js
index f2c7b502a8d..9ab4f093e00 100644
--- a/jstests/concurrency/fsm_workloads/internal_transactions_sharded.js
+++ b/jstests/concurrency/fsm_workloads/internal_transactions_sharded.js
@@ -105,9 +105,7 @@ var $config = extendWorkload($config, function($config, $super) {
             }
         }
 
-        if (this.overrideReapThreshold) {
-            this.overrideInternalTransactionsReapThreshold(cluster);
-        }
+        this.overrideInternalTransactionsReapThreshold(cluster);
         this.overrideStoreFindAndModifyImagesInSideCollection(cluster);
         if (this.lowerTransactionLifetimeLimitSeconds) {
             this.overrideTransactionLifetimeLimit(cluster);
diff --git a/jstests/concurrency/fsm_workloads/internal_transactions_unsharded.js b/jstests/concurrency/fsm_workloads/internal_transactions_unsharded.js
index c1ecbe773c2..c3eb4386073 100644
--- a/jstests/concurrency/fsm_workloads/internal_transactions_unsharded.js
+++ b/jstests/concurrency/fsm_workloads/internal_transactions_unsharded.js
@@ -78,7 +78,6 @@ var $config = extendWorkload($config, function($config, $super) {
     // The reap threshold is overriden to get coverage for when it schedules reaps during an active
     // workload.
     $config.data.originalInternalSessionReapThreshold = {};
-    $config.data.overrideReapThreshold = true;
 
     // This workload supports setting the 'transactionLifetimeLimitSeconds' to 45 seconds
     // (configurable) during setup() and restoring the original value during teardown().
@@ -556,9 +555,7 @@ var $config = extendWorkload($config, function($config, $super) {
                 this.insertInitialDocuments(db, collName, tid);
             }
         }
-        if (this.overrideReapThreshold) {
-            this.overrideInternalTransactionsReapThreshold(cluster);
-        }
+        this.overrideInternalTransactionsReapThreshold(cluster);
         this.overrideStoreFindAndModifyImagesInSideCollection(cluster);
         if (this.lowerTransactionLifetimeLimitSeconds) {
             this.overrideTransactionLifetimeLimit(cluster);
@@ -566,9 +563,7 @@ var $config = extendWorkload($config, function($config, $super) {
     };
 
     $config.teardown = function teardown(db, collName, cluster) {
-        if (this.overrideReapThreshold) {
-            this.restoreInternalTransactionsReapThreshold(cluster);
-        }
+        this.restoreInternalTransactionsReapThreshold(cluster);
         this.restoreStoreFindAndModifyImagesInSideCollection(cluster);
         if (this.lowerTransactionLifetimeLimitSeconds) {
             this.restoreTransactionLifetimeLimit(cluster);