New upstream version 3.4.14upstream/3.4.14

1 files changed, 14 insertions, 8 deletions

diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp
index 0ad841ea56f..b70617deee3 100644
--- a/src/mongo/db/s/migration_source_manager.cpp
+++ b/src/mongo/db/s/migration_source_manager.cpp
@@ -268,18 +268,18 @@ Status MigrationSourceManager::commitChunkOnRecipient(OperationContext* txn) {
     auto scopedGuard = MakeGuard([&] { cleanupOnError(txn); });
 
     // Tell the recipient shard to fetch the latest changes.
-    Status commitCloneStatus = _cloneDriver->commitClone(txn);
+    auto commitCloneStatus = _cloneDriver->commitClone(txn);
 
     if (MONGO_FAIL_POINT(failMigrationCommit) && commitCloneStatus.isOK()) {
         commitCloneStatus = {ErrorCodes::InternalError,
                              "Failing _recvChunkCommit due to failpoint."};
     }
-
     if (!commitCloneStatus.isOK()) {
-        return {commitCloneStatus.code(),
-                str::stream() << "commit clone failed due to " << commitCloneStatus.toString()};
+        return commitCloneStatus.getStatus();
     }
 
+    _recipientCloneCounts = commitCloneStatus.getValue()["counts"].Obj().getOwned();
+
     _state = kCloneCompleted;
     scopedGuard.Dismiss();
     return Status::OK();
@@ -332,9 +332,13 @@ Status MigrationSourceManager::commitChunkMetadataOnConfig(OperationContext* txn
             ErrorCodes::InternalError, "Failpoint 'migrationCommitNetworkError' generated error");
     }
 
-    const Status migrationCommitStatus =
-        (commitChunkMigrationResponse.isOK() ? commitChunkMigrationResponse.getValue().commandStatus
-                                             : commitChunkMigrationResponse.getStatus());
+    Status migrationCommitStatus = commitChunkMigrationResponse.getStatus();
+    if (migrationCommitStatus.isOK()) {
+        migrationCommitStatus = commitChunkMigrationResponse.getValue().commandStatus;
+        if (migrationCommitStatus.isOK()) {
+            migrationCommitStatus = commitChunkMigrationResponse.getValue().writeConcernStatus;
+        }
+    }
 
     if (!migrationCommitStatus.isOK()) {
         // Need to get the latest optime in case the refresh request goes to a secondary --
@@ -431,7 +435,9 @@ Status MigrationSourceManager::commitChunkMetadataOnConfig(OperationContext* txn
                                                   << "from"
                                                   << _args.getFromShardId()
                                                   << "to"
-                                                  << _args.getToShardId()),
+                                                  << _args.getToShardId()
+                                                  << "counts"
+                                                  << _recipientCloneCounts),
                                        ShardingCatalogClient::kMajorityWriteConcern);
 
     return Status::OK();