SERVER-25002 Wire in new _configsvrMergeChunks command so shards no longer run applyOps directly

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/s/request_types/merge_chunk_request_type.cpp b/src/mongo/s/request_types/merge_chunk_request_type.cpp
index 508bf9b247d..103c5087368 100644
--- a/src/mongo/s/request_types/merge_chunk_request_type.cpp
+++ b/src/mongo/s/request_types/merge_chunk_request_type.cpp
@@ -48,9 +48,9 @@ const char kShardName[] = "shard";
 }  // unnamed namespace
 
 MergeChunkRequest::MergeChunkRequest(NamespaceString nss,
+                                     string shardName,
                                      OID epoch,
-                                     vector<BSONObj> chunkBoundaries,
-                                     string shardName)
+                                     vector<BSONObj> chunkBoundaries)
     : _nss(std::move(nss)),
       _epoch(std::move(epoch)),
       _chunkBoundaries(std::move(chunkBoundaries)),
@@ -94,7 +94,7 @@ StatusWith<MergeChunkRequest> MergeChunkRequest::parseFromConfigCommand(const BS
     }
 
     auto request = MergeChunkRequest(
-        NamespaceString(ns), std::move(epoch), std::move(chunkBoundaries), std::move(shardName));
+        NamespaceString(ns), std::move(shardName), std::move(epoch), std::move(chunkBoundaries));
     Status validationStatus = request._validate();
     if (!validationStatus.isOK()) {
         return validationStatus;