SERVER-50034 Make donorStartMigration command retries join the active migration

3 files changed, 28 insertions, 15 deletions

diff --git a/jstests/core/views/views_all_commands.js b/jstests/core/views/views_all_commands.js
index 1f87251c9fb..57344485f8c 100644
--- a/jstests/core/views/views_all_commands.js
+++ b/jstests/core/views/views_all_commands.js
@@ -418,6 +418,7 @@ let viewsCommandTests = {
     refineCollectionShardKey: {skip: isUnrelated},
     refreshLogicalSessionCacheNow: {skip: isAnInternalCommand},
     reapLogicalSessionCacheNow: {skip: isAnInternalCommand},
+    recipientSyncData: {skip: isUnrelated},
     refreshSessions: {skip: isUnrelated},
     reIndex: {
         command: {reIndex: "view"},
diff --git a/jstests/replsets/tenant_migration_donor_state_machine.js b/jstests/replsets/tenant_migration_donor_state_machine.js
index c4d73d7506f..cc90fd94bad 100644
--- a/jstests/replsets/tenant_migration_donor_state_machine.js
+++ b/jstests/replsets/tenant_migration_donor_state_machine.js
@@ -23,19 +23,31 @@ const donorRst = new ReplSetTest(
     {nodes: [{}, {rsConfig: {priority: 0}}, {rsConfig: {priority: 0}}], name: 'donor'});
 const recipientRst = new ReplSetTest({nodes: 1, name: 'recipient'});
 
-donorRst.startSet();
-donorRst.initiate();
-recipientRst.startSet();
-recipientRst.initiate();
-
-const donorPrimary = donorRst.getPrimary();
-const recipientPrimary = recipientRst.getPrimary();
-const kRecipientConnString = recipientRst.getURL();
 const kDBPrefix = 'testDb';
 const kConfigDonorsNS = "config.tenantMigrationDonors";
 
+let donorPrimary;
+let recipientPrimary;
+let kRecipientConnString;
+
+const setup = () => {
+    donorRst.startSet();
+    donorRst.initiate();
+    recipientRst.startSet();
+    recipientRst.initiate();
+
+    donorPrimary = donorRst.getPrimary();
+    recipientPrimary = recipientRst.getPrimary();
+    kRecipientConnString = recipientRst.getURL();
+};
+const tearDown = () => {
+    donorRst.stopSet();
+    recipientRst.stopSet();
+};
+
 (() => {
     // Test the case where the migration commits.
+    setup();
     const dbName = kDBPrefix + "Commit";
 
     function startMigration(host, recipientConnString, dbName) {
@@ -88,11 +100,13 @@ const kConfigDonorsNS = "config.tenantMigrationDonors";
     const recipientSyncDataMetrics =
         recipientPrimary.adminCommand({serverStatus: 1}).metrics.commands.recipientSyncData;
     assert.eq(recipientSyncDataMetrics.failed, 0);
-    assert.neq(recipientSyncDataMetrics.total, 0);
+    assert.eq(recipientSyncDataMetrics.total, 2);
+    tearDown();
 })();
 
 (() => {
     // Test the case where the migration aborts.
+    setup();
     const dbName = kDBPrefix + "Abort";
 
     let abortFp = configureFailPoint(donorPrimary, "abortTenantMigrationAfterBlockingStarts");
@@ -123,9 +137,7 @@ const kConfigDonorsNS = "config.tenantMigrationDonors";
     const recipientSyncDataMetrics =
         recipientPrimary.adminCommand({serverStatus: 1}).metrics.commands.recipientSyncData;
     assert.eq(recipientSyncDataMetrics.failed, 0);
-    assert.neq(recipientSyncDataMetrics.total, 0);
+    assert.eq(recipientSyncDataMetrics.total, 2);
+    tearDown();
 })();
-
-donorRst.stopSet();
-recipientRst.stopSet();
 })();
diff --git a/src/mongo/db/repl/tenant_migration_donor_util.cpp b/src/mongo/db/repl/tenant_migration_donor_util.cpp
index c33ab2714f8..ca0e8e99553 100644
--- a/src/mongo/db/repl/tenant_migration_donor_util.cpp
+++ b/src/mongo/db/repl/tenant_migration_donor_util.cpp
@@ -265,7 +265,7 @@ void sendRecipientSyncDataCommand(OperationContext* opCtx,
                                   donorConnectionString,
                                   donorStateDoc.getDatabasePrefix().toString(),
                                   ReadPreferenceSetting());
-
+        request.setReturnAfterReachingOpTime(donorStateDoc.getBlockTimestamp());
         return request.toBSON(BSONObj());
     }());
 
@@ -317,7 +317,7 @@ void startMigration(OperationContext* opCtx, TenantMigrationDonorDocument donorS
 
         updateDonorStateDocument(opCtx, donorStateDoc, TenantMigrationDonorStateEnum::kBlocking);
 
-        // TODO: Send recipientSyncData with returnAfterReachingTimestamp set to the blockTimestamp.
+        sendRecipientSyncDataCommand(opCtx, donorStateDoc);
 
         pauseTenantMigrationAfterBlockingStarts.pauseWhileSet(opCtx);