SERVER-69237 Make preImage doc available to CollectionUpdateArgs

2 files changed, 7 insertions, 7 deletions

diff --git a/src/mongo/db/repl/storage_timestamp_test.cpp b/src/mongo/db/repl/storage_timestamp_test.cpp
index df33d614242..9accf4a37b8 100644
--- a/src/mongo/db/repl/storage_timestamp_test.cpp
+++ b/src/mongo/db/repl/storage_timestamp_test.cpp
@@ -3184,14 +3184,14 @@ TEST_F(RetryableFindAndModifyTest, RetryableFindAndModifyUpdate) {
         "storeFindAndModifyImagesInSideCollection", true);
     AutoGetCollection autoColl(_opCtx, nss, LockMode::MODE_X);
     CollectionWriter collection(_opCtx, autoColl);
+    const auto criteria = BSON("_id" << 0);
     const auto newObj = BSON("_id" << 0 << "a" << 1 << "b" << 1);
-    CollectionUpdateArgs args;
+    CollectionUpdateArgs args{oldObj};
+    args.criteria = criteria;
     args.stmtIds = {1};
-    args.preImageDoc = oldObj;
     args.updatedDoc = newObj;
     args.storeDocOption = CollectionUpdateArgs::StoreDocOption::PreImage;
     args.update = BSON("$set" << BSON("b" << 1));
-    args.criteria = BSON("_id" << 0);
     args.retryableWrite = true;
 
     {
@@ -3242,14 +3242,14 @@ TEST_F(RetryableFindAndModifyTest, RetryableFindAndModifyUpdateWithDamages) {
     ASSERT_EQUALS(mmb::Document::kInPlaceEnabled, doc.getCurrentInPlaceMode());
     AutoGetCollection autoColl(_opCtx, nss, LockMode::MODE_X);
     CollectionWriter collection(_opCtx, autoColl);
+    const auto criteria = BSON("_id" << 0);
     const auto newObj = BSON("_id" << 0 << "a" << 0);
-    CollectionUpdateArgs args;
+    CollectionUpdateArgs args{oldObj};
+    args.criteria = criteria;
     args.stmtIds = {1};
-    args.preImageDoc = oldObj;
     args.updatedDoc = newObj;
     args.storeDocOption = CollectionUpdateArgs::StoreDocOption::PreImage;
     args.update = BSON("$set" << BSON("a" << 0));
-    args.criteria = BSON("_id" << 0);
     args.retryableWrite = true;
 
     {
diff --git a/src/mongo/db/repl/tenant_migration_donor_service.cpp b/src/mongo/db/repl/tenant_migration_donor_service.cpp
index 0f8f8459535..3a4505280a3 100644
--- a/src/mongo/db/repl/tenant_migration_donor_service.cpp
+++ b/src/mongo/db/repl/tenant_migration_donor_service.cpp
@@ -652,7 +652,7 @@ ExecutorFuture<repl::OpTime> TenantMigrationDonorService::Instance::_updateState
                            return _stateDoc.toBSON();
                        }();
 
-                       CollectionUpdateArgs args;
+                       CollectionUpdateArgs args{originalSnapshot.value()};
                        args.criteria = BSON("_id" << _migrationUuid);
                        args.oplogSlots = {oplogSlot};
                        args.update = updatedStateDocBson;