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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/s/request_types/split_chunk_request_type.cpp b/src/mongo/s/request_types/split_chunk_request_type.cpp
index 78c2c478d0c..a3ca50c7f32 100644
--- a/src/mongo/s/request_types/split_chunk_request_type.cpp
+++ b/src/mongo/s/request_types/split_chunk_request_type.cpp
@@ -48,10 +48,10 @@ const char kShardName[] = "shard";
 }  // unnamed namespace
 
 SplitChunkRequest::SplitChunkRequest(NamespaceString nss,
+                                     string shardName,
                                      OID epoch,
                                      ChunkRange chunkRange,
-                                     vector<BSONObj> splitPoints,
-                                     string shardName)
+                                     vector<BSONObj> splitPoints)
     : _nss(std::move(nss)),
       _epoch(std::move(epoch)),
       _chunkRange(std::move(chunkRange)),
@@ -102,10 +102,10 @@ StatusWith<SplitChunkRequest> SplitChunkRequest::parseFromConfigCommand(const BS
     }
 
     auto request = SplitChunkRequest(NamespaceString(ns),
+                                     std::move(shardName),
                                      std::move(epoch),
                                      std::move(chunkRangeStatus.getValue()),
-                                     std::move(splitPoints),
-                                     std::move(shardName));
+                                     std::move(splitPoints));
     Status validationStatus = request._validate();
     if (!validationStatus.isOK()) {
         return validationStatus;
@@ -160,7 +160,7 @@ const string& SplitChunkRequest::getShardName() const {
 Status SplitChunkRequest::_validate() {
     if (!getNamespace().isValid()) {
         return Status(ErrorCodes::InvalidNamespace,
-                      str::stream() << "invalid namespaace '" << _nss.ns()
+                      str::stream() << "invalid namespace '" << _nss.ns()
                                     << "' specified for request");
     }