SERVER-45999 Remove unused opCtx argument to PersistentTaskStore constructor

6 files changed, 44 insertions, 56 deletions

diff --git a/src/mongo/db/s/migration_util.cpp b/src/mongo/db/s/migration_util.cpp
index 75567a53488..a057dacd3e0 100644
--- a/src/mongo/db/s/migration_util.cpp
+++ b/src/mongo/db/s/migration_util.cpp
@@ -233,7 +233,7 @@ Query overlappingRangeQuery(const ChunkRange& range, const UUID& uuid) {
 size_t checkForConflictingDeletions(OperationContext* opCtx,
                                     const ChunkRange& range,
                                     const UUID& uuid) {
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     return store.count(opCtx, overlappingRangeQuery(range, uuid));
 }
@@ -332,7 +332,7 @@ ExecutorFuture<void> submitRangeDeletionTask(OperationContext* opCtx,
 }
 
 void submitPendingDeletions(OperationContext* opCtx) {
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     auto query = QUERY("pending" << BSON("$exists" << false));
 
@@ -434,8 +434,7 @@ void submitOrphanRanges(OperationContext* opCtx, const NamespaceString& nss, con
         if (deletions.empty())
             return;
 
-        PersistentTaskStore<RangeDeletionTask> store(opCtx,
-                                                     NamespaceString::kRangeDeletionNamespace);
+        PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
         for (const auto& task : deletions) {
             LOGV2_DEBUG(22032,
@@ -475,7 +474,7 @@ void submitOrphanRangesForCleanup(OperationContext* opCtx) {
 void persistMigrationCoordinatorLocally(OperationContext* opCtx,
                                         const MigrationCoordinatorDocument& migrationDoc) {
     PersistentTaskStore<MigrationCoordinatorDocument> store(
-        opCtx, NamespaceString::kMigrationCoordinatorsNamespace);
+        NamespaceString::kMigrationCoordinatorsNamespace);
     try {
         store.add(opCtx, migrationDoc);
     } catch (const ExceptionFor<ErrorCodes::DuplicateKey>&) {
@@ -490,7 +489,7 @@ void persistMigrationCoordinatorLocally(OperationContext* opCtx,
 
 void persistRangeDeletionTaskLocally(OperationContext* opCtx,
                                      const RangeDeletionTask& deletionTask) {
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     try {
         store.add(opCtx, deletionTask);
     } catch (const ExceptionFor<ErrorCodes::DuplicateKey>&) {
@@ -509,7 +508,7 @@ void persistCommitDecision(OperationContext* opCtx, const UUID& migrationId) {
             hangInPersistMigrateCommitDecisionInterruptible.pauseWhileSet(newOpCtx);
 
             PersistentTaskStore<MigrationCoordinatorDocument> store(
-                newOpCtx, NamespaceString::kMigrationCoordinatorsNamespace);
+                NamespaceString::kMigrationCoordinatorsNamespace);
             store.update(newOpCtx,
                          QUERY(MigrationCoordinatorDocument::kIdFieldName << migrationId),
                          BSON("$set" << BSON(MigrationCoordinatorDocument::kDecisionFieldName
@@ -530,7 +529,7 @@ void persistAbortDecision(OperationContext* opCtx, const UUID& migrationId) {
             hangInPersistMigrateAbortDecisionInterruptible.pauseWhileSet(newOpCtx);
 
             PersistentTaskStore<MigrationCoordinatorDocument> store(
-                newOpCtx, NamespaceString::kMigrationCoordinatorsNamespace);
+                NamespaceString::kMigrationCoordinatorsNamespace);
             store.update(newOpCtx,
                          QUERY(MigrationCoordinatorDocument::kIdFieldName << migrationId),
                          BSON("$set" << BSON(MigrationCoordinatorDocument::kDecisionFieldName
@@ -578,8 +577,7 @@ void deleteRangeDeletionTaskLocally(OperationContext* opCtx,
     retryIdempotentWorkAsPrimaryUntilSuccessOrStepdown(
         opCtx, "cancel local range deletion", [&](OperationContext* newOpCtx) {
             hangInDeleteRangeDeletionLocallyInterruptible.pauseWhileSet(newOpCtx);
-            PersistentTaskStore<RangeDeletionTask> store(newOpCtx,
-                                                         NamespaceString::kRangeDeletionNamespace);
+            PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
             store.remove(
                 newOpCtx, QUERY(RangeDeletionTask::kIdFieldName << deletionTaskId), writeConcern);
 
@@ -655,7 +653,7 @@ void advanceTransactionOnRecipient(OperationContext* opCtx,
 }
 
 void markAsReadyRangeDeletionTaskLocally(OperationContext* opCtx, const UUID& migrationId) {
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     auto query = QUERY(RangeDeletionTask::kIdFieldName << migrationId);
     auto update = BSON("$unset" << BSON(RangeDeletionTask::kPendingFieldName << ""));
 
@@ -675,7 +673,7 @@ void markAsReadyRangeDeletionTaskLocally(OperationContext* opCtx, const UUID& mi
 
 void deleteMigrationCoordinatorDocumentLocally(OperationContext* opCtx, const UUID& migrationId) {
     PersistentTaskStore<MigrationCoordinatorDocument> store(
-        opCtx, NamespaceString::kMigrationCoordinatorsNamespace);
+        NamespaceString::kMigrationCoordinatorsNamespace);
     store.remove(opCtx,
                  QUERY(MigrationCoordinatorDocument::kIdFieldName << migrationId),
                  {1, WriteConcernOptions::SyncMode::UNSET, Seconds(0)});
@@ -802,7 +800,7 @@ void resumeMigrationCoordinationsOnStepUp(OperationContext* opCtx) {
 
             long long migrationRecoveryCount = 0;
             PersistentTaskStore<MigrationCoordinatorDocument> store(
-                opCtx, NamespaceString::kMigrationCoordinatorsNamespace);
+                NamespaceString::kMigrationCoordinatorsNamespace);
             Query query;
             store.forEach(
                 opCtx,
diff --git a/src/mongo/db/s/migration_util_test.cpp b/src/mongo/db/s/migration_util_test.cpp
index d8e6c1c3fbc..ec27148011b 100644
--- a/src/mongo/db/s/migration_util_test.cpp
+++ b/src/mongo/db/s/migration_util_test.cpp
@@ -106,7 +106,7 @@ TEST_F(MigrationUtilsTest, TestOverlappingRangeQueryWithIntegerShardKey) {
     auto opCtx = operationContext();
     const auto uuid = UUID::gen();
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     store.add(opCtx, createDeletionTask(NamespaceString{"one"}, uuid, 0, 10));
     store.add(opCtx, createDeletionTask(NamespaceString{"two"}, uuid, 10, 20));
@@ -163,7 +163,7 @@ TEST_F(MigrationUtilsTest, TestOverlappingRangeQueryWithCompoundShardKeyWhereFir
     auto opCtx = operationContext();
     const auto uuid = UUID::gen();
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     auto deletionTasks = {
         createDeletionTask(
@@ -238,7 +238,7 @@ TEST_F(MigrationUtilsTest,
     auto opCtx = operationContext();
     const auto uuid = UUID::gen();
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     auto deletionTasks = {
         createDeletionTask(
@@ -312,7 +312,7 @@ TEST_F(MigrationUtilsTest, TestInvalidUUID) {
     auto opCtx = operationContext();
     const auto uuid = UUID::gen();
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     store.add(opCtx, createDeletionTask(NamespaceString{"one"}, uuid, 0, 10));
     store.add(opCtx, createDeletionTask(NamespaceString{"two"}, uuid, 10, 20));
@@ -472,7 +472,7 @@ TEST_F(SubmitRangeDeletionTaskTest,
 
     auto deletionTask = createDeletionTask(kNss, kDefaultUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
@@ -497,7 +497,7 @@ TEST_F(SubmitRangeDeletionTaskTest, FailsAndDeletesTaskIfNamespaceIsUnshardedEve
 
     auto deletionTask = createDeletionTask(kNss, kDefaultUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
@@ -524,7 +524,7 @@ TEST_F(SubmitRangeDeletionTaskTest,
 
     auto deletionTask = createDeletionTask(kNss, kDefaultUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
@@ -552,7 +552,7 @@ TEST_F(SubmitRangeDeletionTaskTest, SucceedsIfFilteringMetadataUUIDMatchesTaskUU
     auto collectionUUID = createCollectionAndGetUUID(kNss);
     auto deletionTask = createDeletionTask(kNss, collectionUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
@@ -579,7 +579,7 @@ TEST_F(
     auto collectionUUID = createCollectionAndGetUUID(kNss);
     auto deletionTask = createDeletionTask(kNss, collectionUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
@@ -611,7 +611,7 @@ TEST_F(SubmitRangeDeletionTaskTest,
     auto collectionUUID = createCollectionAndGetUUID(kNss);
     auto deletionTask = createDeletionTask(kNss, collectionUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
@@ -647,7 +647,7 @@ TEST_F(SubmitRangeDeletionTaskTest,
     auto collectionUUID = createCollectionAndGetUUID(kNss);
     auto deletionTask = createDeletionTask(kNss, collectionUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
@@ -670,7 +670,7 @@ TEST_F(SubmitRangeDeletionTaskTest,
 
     auto deletionTask = createDeletionTask(kNss, kDefaultUUID, 0, 10, _myShardName);
 
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     store.add(opCtx, deletionTask);
     ASSERT_EQ(store.count(opCtx), 1);
     migrationutil::markAsReadyRangeDeletionTaskLocally(opCtx, deletionTask.getId());
diff --git a/src/mongo/db/s/persistent_task_store.h b/src/mongo/db/s/persistent_task_store.h
index c0953518dd2..5e68a274594 100644
--- a/src/mongo/db/s/persistent_task_store.h
+++ b/src/mongo/db/s/persistent_task_store.h
@@ -50,8 +50,7 @@ const WriteConcernOptions kMajorityWriteConcern{WriteConcernOptions::kMajority,
 template <typename T>
 class PersistentTaskStore {
 public:
-    PersistentTaskStore(OperationContext* opCtx, NamespaceString storageNss)
-        : _storageNss(std::move(storageNss)) {}
+    PersistentTaskStore(NamespaceString storageNss) : _storageNss(std::move(storageNss)) {}
 
     /**
      * Adds a task to the store.
diff --git a/src/mongo/db/s/persistent_task_store_test.cpp b/src/mongo/db/s/persistent_task_store_test.cpp
index 6a3b35a87da..98eb57af514 100644
--- a/src/mongo/db/s/persistent_task_store_test.cpp
+++ b/src/mongo/db/s/persistent_task_store_test.cpp
@@ -71,7 +71,7 @@ struct TestTask {
 TEST_F(PersistentTaskStoreTest, TestAdd) {
     auto opCtx = operationContext();
 
-    PersistentTaskStore<TestTask> store(opCtx, kNss);
+    PersistentTaskStore<TestTask> store(kNss);
 
     store.add(opCtx, TestTask{"one", 0, 10});
     store.add(opCtx, TestTask{"two", 10, 20});
@@ -83,7 +83,7 @@ TEST_F(PersistentTaskStoreTest, TestAdd) {
 TEST_F(PersistentTaskStoreTest, TestForEach) {
     auto opCtx = operationContext();
 
-    PersistentTaskStore<TestTask> store(opCtx, kNss);
+    PersistentTaskStore<TestTask> store(kNss);
 
     store.add(opCtx, TestTask{"one", 0, 10});
     store.add(opCtx, TestTask{"two", 10, 20});
@@ -133,7 +133,7 @@ TEST_F(PersistentTaskStoreTest, TestForEach) {
 TEST_F(PersistentTaskStoreTest, TestRemove) {
     auto opCtx = operationContext();
 
-    PersistentTaskStore<TestTask> store(opCtx, kNss);
+    PersistentTaskStore<TestTask> store(kNss);
 
     store.add(opCtx, TestTask{"one", 0, 10});
     store.add(opCtx, TestTask{"two", 10, 20});
@@ -151,7 +151,7 @@ TEST_F(PersistentTaskStoreTest, TestRemove) {
 TEST_F(PersistentTaskStoreTest, TestRemoveMultiple) {
     auto opCtx = operationContext();
 
-    PersistentTaskStore<TestTask> store(opCtx, kNss);
+    PersistentTaskStore<TestTask> store(kNss);
 
     store.add(opCtx, TestTask{"one", 0, 10});
     store.add(opCtx, TestTask{"two", 10, 20});
@@ -168,7 +168,7 @@ TEST_F(PersistentTaskStoreTest, TestRemoveMultiple) {
 TEST_F(PersistentTaskStoreTest, TestUpdate) {
     auto opCtx = operationContext();
 
-    PersistentTaskStore<TestTask> store(opCtx, kNss);
+    PersistentTaskStore<TestTask> store(kNss);
     int originalMin = 0;
     int expectedUpdatedMin = 1;
     store.add(opCtx, TestTask{"one", originalMin, 10});
@@ -194,7 +194,7 @@ TEST_F(PersistentTaskStoreTest, TestUpdate) {
 TEST_F(PersistentTaskStoreTest, TestUpdateOnlyUpdatesOneMatchingDocument) {
     auto opCtx = operationContext();
 
-    PersistentTaskStore<TestTask> store(opCtx, kNss);
+    PersistentTaskStore<TestTask> store(kNss);
     int originalMin = 0;
     int expectedUpdatedMin = 1;
     std::string keyToMatch = "one";
@@ -212,7 +212,7 @@ TEST_F(PersistentTaskStoreTest, TestWritesPersistAcrossInstances) {
     auto opCtx = operationContext();
 
     {
-        PersistentTaskStore<TestTask> store(opCtx, kNss);
+        PersistentTaskStore<TestTask> store(kNss);
 
         store.add(opCtx, TestTask{"one", 0, 10});
         store.add(opCtx, TestTask{"two", 10, 20});
@@ -222,7 +222,7 @@ TEST_F(PersistentTaskStoreTest, TestWritesPersistAcrossInstances) {
     }
 
     {
-        PersistentTaskStore<TestTask> store(opCtx, kNss);
+        PersistentTaskStore<TestTask> store(kNss);
         ASSERT_EQ(store.count(opCtx), 3);
 
         auto count = store.count(opCtx, QUERY("min" << GTE << 10));
@@ -238,7 +238,7 @@ TEST_F(PersistentTaskStoreTest, TestWritesPersistAcrossInstances) {
     }
 
     {
-        PersistentTaskStore<TestTask> store(opCtx, kNss);
+        PersistentTaskStore<TestTask> store(kNss);
         ASSERT_EQ(store.count(opCtx), 2);
 
         auto count = store.count(opCtx, QUERY("min" << GTE << 10));
@@ -249,7 +249,7 @@ TEST_F(PersistentTaskStoreTest, TestWritesPersistAcrossInstances) {
 TEST_F(PersistentTaskStoreTest, TestCountWithQuery) {
     auto opCtx = operationContext();
 
-    PersistentTaskStore<TestTask> store(opCtx, kNss);
+    PersistentTaskStore<TestTask> store(kNss);
 
     store.add(opCtx, TestTask{"one", 0, 10});
     store.add(opCtx, TestTask{"two", 10, 20});
diff --git a/src/mongo/db/s/range_deletion_util.cpp b/src/mongo/db/s/range_deletion_util.cpp
index bf3adab6da8..42dccae3a6f 100644
--- a/src/mongo/db/s/range_deletion_util.cpp
+++ b/src/mongo/db/s/range_deletion_util.cpp
@@ -265,7 +265,7 @@ void ensureRangeDeletionTaskStillExists(OperationContext* opCtx, const UUID& mig
     // corruption. The scheme for checking whether the range deletion task document still exists
     // relies on the executor only having a single thread and that thread being solely responsible
     // for deleting the range deletion task document.
-    PersistentTaskStore<RangeDeletionTask> store(opCtx, NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     auto count = store.count(opCtx,
                              QUERY(RangeDeletionTask::kIdFieldName
                                    << migrationId << RangeDeletionTask::kPendingFieldName
@@ -361,8 +361,7 @@ void notifySecondariesThatDeletionIsOccurring(const NamespaceString& nss,
 
 void removePersistentRangeDeletionTask(const NamespaceString& nss, UUID migrationId) {
     withTemporaryOperationContext([&](OperationContext* opCtx) {
-        PersistentTaskStore<RangeDeletionTask> store(opCtx,
-                                                     NamespaceString::kRangeDeletionNamespace);
+        PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
         store.remove(opCtx, QUERY(RangeDeletionTask::kIdFieldName << migrationId));
     });
diff --git a/src/mongo/db/s/range_deletion_util_test.cpp b/src/mongo/db/s/range_deletion_util_test.cpp
index b4820c3f038..8a3745b3c80 100644
--- a/src/mongo/db/s/range_deletion_util_test.cpp
+++ b/src/mongo/db/s/range_deletion_util_test.cpp
@@ -420,8 +420,7 @@ TEST_F(RangeDeleterTest, RemoveDocumentsInRangeWaitsForReplicationAfterDeletingS
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(uuid());
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     const ChunkRange range(BSON(kShardKey << 0), BSON(kShardKey << 10));
     RangeDeletionTask t(
         UUID::gen(), kNss, uuid(), ShardId("donor"), range, CleanWhenEnum::kDelayed);
@@ -477,8 +476,7 @@ TEST_F(RangeDeleterTest, RemoveDocumentsInRangeWaitsForReplicationOnlyOnceAfterS
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(uuid());
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     const ChunkRange range(BSON(kShardKey << 0), BSON(kShardKey << 10));
     RangeDeletionTask t(
         UUID::gen(), kNss, uuid(), ShardId("donor"), range, CleanWhenEnum::kDelayed);
@@ -528,8 +526,7 @@ TEST_F(RangeDeleterTest, RemoveDocumentsInRangeDoesNotWaitForReplicationIfErrorD
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(uuid());
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     const ChunkRange range(BSON(kShardKey << 0), BSON(kShardKey << 10));
     RangeDeletionTask t(
         UUID::gen(), kNss, uuid(), ShardId("donor"), range, CleanWhenEnum::kDelayed);
@@ -581,8 +578,7 @@ TEST_F(RangeDeleterTest, RemoveDocumentsInRangeRetriesOnWriteConflictException)
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(uuid());
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     RangeDeletionTask t(
         UUID::gen(), kNss, uuid(), ShardId("donor"), range, CleanWhenEnum::kDelayed);
     store.add(operationContext(), t);
@@ -620,8 +616,7 @@ TEST_F(RangeDeleterTest, RemoveDocumentsInRangeRetriesOnUnexpectedError) {
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(uuid());
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
     RangeDeletionTask t(
         UUID::gen(), kNss, uuid(), ShardId("donor"), range, CleanWhenEnum::kDelayed);
     store.add(operationContext(), t);
@@ -740,8 +735,7 @@ TEST_F(RangeDeleterTest, RemoveDocumentsInRangeRemovesRangeDeletionTaskOnSuccess
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(uuid());
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
 
     RangeDeletionTask t(
@@ -779,8 +773,7 @@ TEST_F(RangeDeleterTest,
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(fakeUuid);
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     RangeDeletionTask t(
         UUID::gen(), kNss, fakeUuid, ShardId("donor"), range, CleanWhenEnum::kDelayed);
@@ -818,8 +811,7 @@ TEST_F(RangeDeleterTest,
 
     // Insert range deletion task for this collection and range.
     setFilteringMetadataWithUUID(uuid());
-    PersistentTaskStore<RangeDeletionTask> store(operationContext(),
-                                                 NamespaceString::kRangeDeletionNamespace);
+    PersistentTaskStore<RangeDeletionTask> store(NamespaceString::kRangeDeletionNamespace);
 
     RangeDeletionTask t(
         UUID::gen(), kNss, uuid(), ShardId("donor"), range, CleanWhenEnum::kDelayed);