diff options
author | Spencer T Brody <spencer@mongodb.com> | 2016-08-30 18:13:32 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@mongodb.com> | 2016-09-06 12:44:46 -0400 |
commit | f8872dc852e32ff1cdfcead7b530bc5c350edfcf (patch) | |
tree | 9e30188a1a43c04178360ffd979651692d2fe7dc /src/mongo/s/request_types/merge_chunk_request_type.cpp | |
parent | e0a2e534e4c917d6abe7f6d00c1eaf75fa9f2358 (diff) | |
download | mongo-f8872dc852e32ff1cdfcead7b530bc5c350edfcf.tar.gz |
SERVER-25002 Wire in new _configsvrMergeChunks command so shards no longer run applyOps directly
Diffstat (limited to 'src/mongo/s/request_types/merge_chunk_request_type.cpp')
-rw-r--r-- | src/mongo/s/request_types/merge_chunk_request_type.cpp | 6 |
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; |