SERVER-47224 Rename commit quorum option "all" to "votingMembers".

(cherry picked from commit d17b038e166da961ec5e57fd675b095a516072f3)

9 files changed, 41 insertions, 40 deletions

diff --git a/src/mongo/db/catalog/commit_quorum_options.cpp b/src/mongo/db/catalog/commit_quorum_options.cpp
index f1885010cf9..8c868599666 100644
--- a/src/mongo/db/catalog/commit_quorum_options.cpp
+++ b/src/mongo/db/catalog/commit_quorum_options.cpp
@@ -42,11 +42,12 @@ namespace mongo {
 
 const StringData CommitQuorumOptions::kCommitQuorumField = "commitQuorum"_sd;
 const char CommitQuorumOptions::kMajority[] = "majority";
-const char CommitQuorumOptions::kAll[] = "all";
+const char CommitQuorumOptions::kVotingMembers[] = "votingMembers";
 
 const BSONObj CommitQuorumOptions::Majority(BSON(kCommitQuorumField
                                                  << CommitQuorumOptions::kMajority));
-const BSONObj CommitQuorumOptions::all(BSON(kCommitQuorumField << CommitQuorumOptions::kAll));
+const BSONObj CommitQuorumOptions::VotingMembers(BSON(kCommitQuorumField
+                                                      << CommitQuorumOptions::kVotingMembers));
 
 CommitQuorumOptions::CommitQuorumOptions(int numNodesOpts) {
     reset();
diff --git a/src/mongo/db/catalog/commit_quorum_options.h b/src/mongo/db/catalog/commit_quorum_options.h
index cd556c02299..1a29836a633 100644
--- a/src/mongo/db/catalog/commit_quorum_options.h
+++ b/src/mongo/db/catalog/commit_quorum_options.h
@@ -40,7 +40,7 @@ class Status;
 /**
  * The 'CommitQuorumOptions' has the same range of settings as the 'w' field from
  * 'WriteConcernOptions'. It can be set to an integer starting from 0 and up, or to a string. The
- * string option can either be 'majority' or a replica set tag.
+ * string option can be 'majority', 'votingMembers' or a replica set tag.
  *
  * The principal idea behind 'CommitQuorumOptions' is to figure out when an index build should be
  * committed on the replica set based on the number of commit ready members.
@@ -49,12 +49,12 @@ class CommitQuorumOptions {
 public:
     static const StringData kCommitQuorumField;  // = "commitQuorum"
     static const char kMajority[];               // = "majority"
-    static const char kAll[];                    // = "all"
+    static const char kVotingMembers[];          // = "votingMembers"
 
     static const int kUninitializedNumNodes = -1;
     static const int kDisabled = 0;
-    static const BSONObj Majority;  // = {"commitQuorum": "majority"}
-    static const BSONObj all;       // = {"commitQuorum": "all"}
+    static const BSONObj Majority;       // = {"commitQuorum": "majority"}
+    static const BSONObj VotingMembers;  // = {"commitQuorum": "votingMembers"}
 
     CommitQuorumOptions() {
         reset();
diff --git a/src/mongo/db/catalog/commit_quorum_options_test.cpp b/src/mongo/db/catalog/commit_quorum_options_test.cpp
index 73f4b2e497c..e0c6e4d6e4e 100644
--- a/src/mongo/db/catalog/commit_quorum_options_test.cpp
+++ b/src/mongo/db/catalog/commit_quorum_options_test.cpp
@@ -83,12 +83,12 @@ TEST(CommitQuorumOptionsTest, ParseSetsModeIfCommitQuorumIskMajorityString) {
     ASSERT_EQUALS(CommitQuorumOptions::kMajority, options.mode);
 }
 
-TEST(CommitQuorumOptionsTest, ParseSetsModeIfCommitQuorumIskAllString) {
+TEST(CommitQuorumOptionsTest, ParseSetsModeIfCommitQuorumIskVotingMembersString) {
     CommitQuorumOptions options;
-    BSONObj obj = BSON("commitQuorum" << CommitQuorumOptions::kAll);
+    BSONObj obj = BSON("commitQuorum" << CommitQuorumOptions::kVotingMembers);
     ASSERT_OK(options.parse(obj.getField("commitQuorum")));
     ASSERT_EQUALS(-1, options.numNodes);
-    ASSERT_EQUALS(CommitQuorumOptions::kAll, options.mode);
+    ASSERT_EQUALS(CommitQuorumOptions::kVotingMembers, options.mode);
 }
 
 TEST(CommitQuorumOptionsTest, ToBSON) {
diff --git a/src/mongo/db/repl/repl_set_config.cpp b/src/mongo/db/repl/repl_set_config.cpp
index bf76f180683..fed25c41d7b 100644
--- a/src/mongo/db/repl/repl_set_config.cpp
+++ b/src/mongo/db/repl/repl_set_config.cpp
@@ -828,13 +828,13 @@ void ReplSetConfig::_addInternalWriteConcernModes() {
         fassert(28693, status);
     }
 
-    // $all: all voting data-bearing nodes.
+    // $votingMembers: all voting data-bearing nodes.
     pattern = _tagConfig.makePattern();
     status = _tagConfig.addTagCountConstraintToPattern(
         &pattern, MemberConfig::kInternalVoterTagName, _writableVotingMembersCount);
 
     if (status.isOK()) {
-        _customWriteConcernModes[kAllWriteConcernModeName] = pattern;
+        _customWriteConcernModes[kVotingMembersWriteConcernModeName] = pattern;
     } else if (status != ErrorCodes::NoSuchKey) {
         // NoSuchKey means we have no $voter-tagged nodes in this config;
         // other errors are unexpected.
diff --git a/src/mongo/db/repl/repl_set_config.h b/src/mongo/db/repl/repl_set_config.h
index 039ba0b6827..ce93134f3e9 100644
--- a/src/mongo/db/repl/repl_set_config.h
+++ b/src/mongo/db/repl/repl_set_config.h
@@ -118,7 +118,7 @@ public:
     static const std::string kVersionFieldName;
     static const std::string kTermFieldName;
     static constexpr char kMajorityWriteConcernModeName[] = "$majority";
-    static constexpr char kAllWriteConcernModeName[] = "$all";
+    static constexpr char kVotingMembersWriteConcernModeName[] = "$votingMembers";
     static constexpr char kConfigMajorityWriteConcernModeName[] = "$configMajority";
     static constexpr char kConfigAllWriteConcernName[] = "$configAll";
 
diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index 48476d14632..079ba2f3b35 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -1766,8 +1766,8 @@ bool ReplicationCoordinatorImpl::isCommitQuorumSatisfied(
     StringData patternName;
     if (commitQuorum.mode == CommitQuorumOptions::kMajority) {
         patternName = ReplSetConfig::kMajorityWriteConcernModeName;
-    } else if (commitQuorum.mode == CommitQuorumOptions::kAll) {
-        patternName = ReplSetConfig::kAllWriteConcernModeName;
+    } else if (commitQuorum.mode == CommitQuorumOptions::kVotingMembers) {
+        patternName = ReplSetConfig::kVotingMembersWriteConcernModeName;
     } else {
         patternName = commitQuorum.mode;
     }
diff --git a/src/mongo/db/repl/replication_coordinator_impl_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_test.cpp
index dde6c828d59..f58e37bf8fd 100644
--- a/src/mongo/db/repl/replication_coordinator_impl_test.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl_test.cpp
@@ -7220,9 +7220,9 @@ TEST_F(ReplCoordTest, CheckIfCommitQuorumHasReached) {
         majorityModeCQ.mode = "majority";
         ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(majorityModeCQ, commitReadyMembers));
 
-        CommitQuorumOptions allModeCQ;
-        allModeCQ.mode = "all";
-        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(allModeCQ, commitReadyMembers));
+        CommitQuorumOptions votingMembersModeCQ;
+        votingMembersModeCQ.mode = "votingMembers";
+        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(votingMembersModeCQ, commitReadyMembers));
 
         CommitQuorumOptions allNodesCQ;
         allNodesCQ.numNodes = 5;
@@ -7246,9 +7246,9 @@ TEST_F(ReplCoordTest, CheckIfCommitQuorumHasReached) {
         majorityModeCQ.mode = "majority";
         ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(majorityModeCQ, commitReadyMembers));
 
-        CommitQuorumOptions allModeCQ;
-        allModeCQ.mode = "all";
-        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(allModeCQ, commitReadyMembers));
+        CommitQuorumOptions votingMembersModeCQ;
+        votingMembersModeCQ.mode = "votingMembers";
+        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(votingMembersModeCQ, commitReadyMembers));
 
         CommitQuorumOptions allNodesCQ;
         allNodesCQ.numNodes = 5;
@@ -7272,9 +7272,9 @@ TEST_F(ReplCoordTest, CheckIfCommitQuorumHasReached) {
         majorityModeCQ.mode = "majority";
         ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(majorityModeCQ, commitReadyMembers));
 
-        CommitQuorumOptions allModeCQ;
-        allModeCQ.mode = "all";
-        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(allModeCQ, commitReadyMembers));
+        CommitQuorumOptions votingMembersModeCQ;
+        votingMembersModeCQ.mode = "votingMembers";
+        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(votingMembersModeCQ, commitReadyMembers));
 
         CommitQuorumOptions allNodesCQ;
         allNodesCQ.numNodes = 5;
@@ -7298,9 +7298,9 @@ TEST_F(ReplCoordTest, CheckIfCommitQuorumHasReached) {
         majorityModeCQ.mode = "majority";
         ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(majorityModeCQ, commitReadyMembers));
 
-        CommitQuorumOptions allModeCQ;
-        allModeCQ.mode = "all";
-        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(allModeCQ, commitReadyMembers));
+        CommitQuorumOptions votingMembersModeCQ;
+        votingMembersModeCQ.mode = "votingMembers";
+        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(votingMembersModeCQ, commitReadyMembers));
 
         CommitQuorumOptions allNodesCQ;
         allNodesCQ.numNodes = 5;
@@ -7326,9 +7326,9 @@ TEST_F(ReplCoordTest, CheckIfCommitQuorumHasReached) {
         majorityModeCQ.mode = "majority";
         ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(majorityModeCQ, commitReadyMembers));
 
-        CommitQuorumOptions allModeCQ;
-        allModeCQ.mode = "all";
-        ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(allModeCQ, commitReadyMembers));
+        CommitQuorumOptions votingMembersModeCQ;
+        votingMembersModeCQ.mode = "votingMembers";
+        ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(votingMembersModeCQ, commitReadyMembers));
 
         CommitQuorumOptions allNodesCQ;
         allNodesCQ.numNodes = 5;
@@ -7355,9 +7355,9 @@ TEST_F(ReplCoordTest, CheckIfCommitQuorumHasReached) {
         majorityModeCQ.mode = "majority";
         ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(majorityModeCQ, commitReadyMembers));
 
-        CommitQuorumOptions allModeCQ;
-        allModeCQ.mode = "all";
-        ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(allModeCQ, commitReadyMembers));
+        CommitQuorumOptions votingMembersModeCQ;
+        votingMembersModeCQ.mode = "votingMembers";
+        ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(votingMembersModeCQ, commitReadyMembers));
 
         CommitQuorumOptions allNodesCQ;
         allNodesCQ.numNodes = 5;
@@ -7383,9 +7383,9 @@ TEST_F(ReplCoordTest, CheckIfCommitQuorumHasReached) {
         majorityModeCQ.mode = "majority";
         ASSERT_TRUE(replCoord->isCommitQuorumSatisfied(majorityModeCQ, commitReadyMembers));
 
-        CommitQuorumOptions allModeCQ;
-        allModeCQ.mode = "all";
-        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(allModeCQ, commitReadyMembers));
+        CommitQuorumOptions votingMembersModeCQ;
+        votingMembersModeCQ.mode = "votingMembers";
+        ASSERT_FALSE(replCoord->isCommitQuorumSatisfied(votingMembersModeCQ, commitReadyMembers));
 
         CommitQuorumOptions numNodesCQ;
         numNodesCQ.numNodes = 4;
diff --git a/src/mongo/db/repl/topology_coordinator.cpp b/src/mongo/db/repl/topology_coordinator.cpp
index 97fac3b3770..75a8deb3478 100644
--- a/src/mongo/db/repl/topology_coordinator.cpp
+++ b/src/mongo/db/repl/topology_coordinator.cpp
@@ -3244,7 +3244,7 @@ TopologyCoordinator::latestKnownOpTimeSinceHeartbeatRestartPerMember() const {
 bool TopologyCoordinator::checkIfCommitQuorumCanBeSatisfied(
     const CommitQuorumOptions& commitQuorum) const {
     if (!commitQuorum.mode.empty() && commitQuorum.mode != CommitQuorumOptions::kMajority &&
-        commitQuorum.mode != CommitQuorumOptions::kAll) {
+        commitQuorum.mode != CommitQuorumOptions::kVotingMembers) {
         StatusWith<ReplSetTagPattern> tagPatternStatus =
             _rsConfig.findCustomWriteMode(commitQuorum.mode);
         if (!tagPatternStatus.isOK()) {
@@ -3269,7 +3269,7 @@ bool TopologyCoordinator::checkIfCommitQuorumCanBeSatisfied(
     if (!commitQuorum.mode.empty()) {
         if (commitQuorum.mode == CommitQuorumOptions::kMajority) {
             nodesRemaining = _rsConfig.getWriteMajority();
-        } else if (commitQuorum.mode == CommitQuorumOptions::kAll) {
+        } else if (commitQuorum.mode == CommitQuorumOptions::kVotingMembers) {
             nodesRemaining = _rsConfig.getWritableVotingMembersCount();
         }
     }
diff --git a/src/mongo/db/repl/topology_coordinator_v1_test.cpp b/src/mongo/db/repl/topology_coordinator_v1_test.cpp
index e64a300ce8f..20a419f0e42 100644
--- a/src/mongo/db/repl/topology_coordinator_v1_test.cpp
+++ b/src/mongo/db/repl/topology_coordinator_v1_test.cpp
@@ -6187,9 +6187,9 @@ TEST_F(TopoCoordTest, CheckIfCommitQuorumCanBeSatisfied) {
     majorityCQ.mode = "majority";
     ASSERT_TRUE(getTopoCoord().checkIfCommitQuorumCanBeSatisfied(majorityCQ));
 
-    CommitQuorumOptions allCQ;
-    allCQ.mode = "all";
-    ASSERT_TRUE(getTopoCoord().checkIfCommitQuorumCanBeSatisfied(allCQ));
+    CommitQuorumOptions votingMembersCQ;
+    votingMembersCQ.mode = "votingMembers";
+    ASSERT_TRUE(getTopoCoord().checkIfCommitQuorumCanBeSatisfied(votingMembersCQ));
 
     CommitQuorumOptions validModeCQ;
     validModeCQ.mode = "valid";