SERVER-25856 Rename _configsvr{Split,Merge}Chunks commands to _configsvrCommitChunk{Split,Merge}

4 files changed, 16 insertions, 16 deletions

diff --git a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
index f947bc01869..8988a5e4e4e 100644
--- a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
+++ b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
@@ -52,7 +52,7 @@ using std::string;
  *
  * Format:
  * {
- *   _configsvrMergeChunk: <string namespace>,
+ *   _configsvrCommitChunkMerge: <string namespace>,
  *   collEpoch: <OID epoch>,
  *   chunkBoundaries: [
  *      <BSONObj key1>,
@@ -65,7 +65,7 @@ using std::string;
  */
 class ConfigSvrMergeChunkCommand : public Command {
 public:
-    ConfigSvrMergeChunkCommand() : Command("_configsvrMergeChunk") {}
+    ConfigSvrMergeChunkCommand() : Command("_configsvrCommitChunkMerge") {}
 
     void help(std::stringstream& help) const override {
         help << "Internal command, which is sent by a shard to the sharding config server. Do "
@@ -106,7 +106,7 @@ public:
              BSONObjBuilder& result) override {
         if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) {
             uasserted(ErrorCodes::IllegalOperation,
-                      "_configsvrMergeChunk can only be run on config servers");
+                      "_configsvrCommitChunkMerge can only be run on config servers");
         }
 
         auto parsedRequest = uassertStatusOK(MergeChunkRequest::parseFromConfigCommand(cmdObj));
diff --git a/src/mongo/db/s/config/configsvr_split_chunk_command.cpp b/src/mongo/db/s/config/configsvr_split_chunk_command.cpp
index 92085bd0db7..a8744987929 100644
--- a/src/mongo/db/s/config/configsvr_split_chunk_command.cpp
+++ b/src/mongo/db/s/config/configsvr_split_chunk_command.cpp
@@ -52,7 +52,7 @@ using std::string;
  *
  * Format:
  * {
- *   _configsvrSplitChunk: <string namespace>,
+ *   _configsvrCommitChunkSplit: <string namespace>,
  *   collEpoch: <OID epoch>,
  *   min: <BSONObj chunkToSplitMin>,
  *   max: <BSONObj chunkToSplitMax>,
@@ -63,7 +63,7 @@ using std::string;
  */
 class ConfigSvrSplitChunkCommand : public Command {
 public:
-    ConfigSvrSplitChunkCommand() : Command("_configsvrSplitChunk") {}
+    ConfigSvrSplitChunkCommand() : Command("_configsvrCommitChunkSplit") {}
 
     void help(std::stringstream& help) const override {
         help << "Internal command, which is sent by a shard to the sharding config server. Do "
@@ -104,7 +104,7 @@ public:
              BSONObjBuilder& result) override {
         if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) {
             uasserted(ErrorCodes::IllegalOperation,
-                      "_configsvrSplitChunk can only be run on config servers");
+                      "_configsvrCommitChunkSplit can only be run on config servers");
         }
 
         auto parsedRequest = uassertStatusOK(SplitChunkRequest::parseFromConfigCommand(cmdObj));
diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp
index 10b11597e47..6aa427c7578 100644
--- a/src/mongo/db/s/merge_chunks_command.cpp
+++ b/src/mongo/db/s/merge_chunks_command.cpp
@@ -263,7 +263,7 @@ Status mergeChunks(OperationContext* txn,
     }
 
     //
-    // Run _configsvrMergeChunks.
+    // Run _configsvrCommitChunkMerge.
     //
     MergeChunkRequest request{
         nss, shardingState->getShardName(), shardVersion.epoch(), chunkBoundaries};
@@ -279,7 +279,7 @@ Status mergeChunks(OperationContext* txn,
 
     //
     // Refresh metadata to pick up new chunk definitions (regardless of the results returned from
-    // running _configsvrMergeChunk).
+    // running _configsvrCommitChunkMerge).
     //
     {
         ChunkVersion shardVersionAfterMerge;
@@ -301,10 +301,10 @@ Status mergeChunks(OperationContext* txn,
         return cmdResponseStatus.getStatus();
     }
 
-    // If _configsvrMergeChunk returned an error, look at this shard's metadata to determine if
-    // the merge actually did happen. This can happen if there's a network error getting the
-    // response from the first call to _configsvrMergeChunk, but it actually succeeds, thus the
-    // automatic retry fails with a precondition violation, for example.
+    // If _configsvrCommitChunkMerge returned an error, look at this shard's metadata to determine
+    // if the merge actually did happen. This can happen if there's a network error getting the
+    // response from the first call to _configsvrCommitChunkMerge, but it actually succeeds, thus
+    // the automatic retry fails with a precondition violation, for example.
     auto commandStatus = std::move(cmdResponseStatus.getValue().commandStatus);
     auto writeConcernStatus = std::move(cmdResponseStatus.getValue().writeConcernStatus);
 
diff --git a/src/mongo/db/s/split_chunk_command.cpp b/src/mongo/db/s/split_chunk_command.cpp
index 74a437a5dbd..5b3f225d205 100644
--- a/src/mongo/db/s/split_chunk_command.cpp
+++ b/src/mongo/db/s/split_chunk_command.cpp
@@ -402,10 +402,10 @@ public:
         }
 
         //
-        // If _configsvrSplitChunk returned an error, look at this shard's metadata to determine if
-        // the split actually did happen. This can happen if there's a network error getting the
-        // response from the first call to _configsvrSplitChunk, but it actually succeeds, thus the
-        // automatic retry fails with a precondition violation, for example.
+        // If _configsvrCommitChunkSplit returned an error, look at this shard's metadata to
+        // determine if  the split actually did happen. This can happen if there's a network error
+        // getting the response from the first call to _configsvrCommitChunkSplit, but it actually
+        // succeeds, thus the automatic retry fails with a precondition violation, for example.
         //
         if ((!commandStatus.isOK() || !writeConcernStatus.isOK()) &&
             _checkMetadataForSuccess(txn, nss, chunkRange, splitKeys)) {