SERVER-50410 Change NotMasterOrSecondary error code name to NotPrimaryOrSecondary

(cherry picked from commit e703a72a49151fa782cfd83a654a6af55663ca38)
(cherry picked from commit 06b1ee3f6877798c91a4b4f2a9984e6e0054ca16)

5 files changed, 8 insertions, 8 deletions

diff --git a/src/mongo/db/repl/replication_coordinator.h b/src/mongo/db/repl/replication_coordinator.h
index f32a88536e1..42ead8e2519 100644
--- a/src/mongo/db/repl/replication_coordinator.h
+++ b/src/mongo/db/repl/replication_coordinator.h
@@ -708,7 +708,7 @@ public:
      * Returns Status::OK() if all updates are processed correctly, NodeNotFound
      * if any updating node cannot be found in the config, InvalidReplicaSetConfig if the
      * "configVersion" sent in any of the updates doesn't match our config version, or
-     * NotMasterOrSecondary if we are in state REMOVED or otherwise don't have a valid
+     * NotPrimaryOrSecondary if we are in state REMOVED or otherwise don't have a valid
      * replica set config.
      * If a non-OK status is returned, it is unspecified whether none or some of the updates
      * were applied.
diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index 8d8c93fbe2b..1a69efabf2e 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -2325,7 +2325,7 @@ Status ReplicationCoordinatorImpl::checkCanServeReadsFor_UNSAFE(OperationContext
         stdx::lock_guard<Latch> lock(_mutex);
         if ((_memberState.startup() && client->isFromUserConnection()) || _memberState.startup2() ||
             _memberState.rollback()) {
-            return Status{ErrorCodes::NotMasterOrSecondary,
+            return Status{ErrorCodes::NotPrimaryOrSecondary,
                           "Oplog collection reads are not allowed while in the rollback or "
                           "startup state."};
         }
@@ -2346,7 +2346,7 @@ Status ReplicationCoordinatorImpl::checkCanServeReadsFor_UNSAFE(OperationContext
         if (isPrimaryOrSecondary) {
             return Status::OK();
         }
-        return Status(ErrorCodes::NotMasterOrSecondary,
+        return Status(ErrorCodes::NotPrimaryOrSecondary,
                       "not master or secondary; cannot currently read from this replSet member");
     }
     return Status(ErrorCodes::NotPrimaryNoSecondaryOk, "not master and slaveOk=false");
diff --git a/src/mongo/db/repl/topology_coordinator.cpp b/src/mongo/db/repl/topology_coordinator.cpp
index 2caaddd5c33..b9d622df06c 100644
--- a/src/mongo/db/repl/topology_coordinator.cpp
+++ b/src/mongo/db/repl/topology_coordinator.cpp
@@ -1067,7 +1067,7 @@ StatusWith<bool> TopologyCoordinator::setLastOptime(const UpdatePositionArgs::Up
                                                     long long* configVersion) {
     if (_selfIndex == -1) {
         // Ignore updates when we're in state REMOVED.
-        return Status(ErrorCodes::NotMasterOrSecondary,
+        return Status(ErrorCodes::NotPrimaryOrSecondary,
                       "Received replSetUpdatePosition command but we are in state REMOVED");
     }
     invariant(_rsConfig.isInitialized());  // Can only use setLastOptime in replSet mode.
diff --git a/src/mongo/db/s/balancer/migration_manager_test.cpp b/src/mongo/db/s/balancer/migration_manager_test.cpp
index 44ba02a9e2b..418b28fe561 100644
--- a/src/mongo/db/s/balancer/migration_manager_test.cpp
+++ b/src/mongo/db/s/balancer/migration_manager_test.cpp
@@ -776,7 +776,7 @@ TEST_F(MigrationManagerTest, RemoteCallErrorConversionToOperationFailed) {
     expectMoveChunkCommand(
         chunk1,
         kShardId1,
-        Status(ErrorCodes::NotMasterOrSecondary,
+        Status(ErrorCodes::NotPrimaryOrSecondary,
                "RemoteCallErrorConversionToOperationFailedCheck generated error."));
 
     // Expect a moveChunk command that will fail with a replset monitor updating error.
diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp
index 585274fdf9d..f949e00fb50 100644
--- a/src/mongo/db/service_entry_point_common.cpp
+++ b/src/mongo/db/service_entry_point_common.cpp
@@ -792,14 +792,14 @@ void execCommandDatabase(OperationContext* opCtx,
                 !replCoord->canAcceptWritesForDatabase_UNSAFE(opCtx, dbname) &&
                 !replCoord->getMemberState().secondary()) {
 
-                uassert(ErrorCodes::NotMasterOrSecondary,
+                uassert(ErrorCodes::NotPrimaryOrSecondary,
                         "node is recovering",
                         !replCoord->getMemberState().recovering());
-                uassert(ErrorCodes::NotMasterOrSecondary,
+                uassert(ErrorCodes::NotPrimaryOrSecondary,
                         "node is not in primary or recovering state",
                         replCoord->getMemberState().primary());
                 // Check ticket SERVER-21432, slaveOk commands are allowed in drain mode
-                uassert(ErrorCodes::NotMasterOrSecondary,
+                uassert(ErrorCodes::NotPrimaryOrSecondary,
                         "node is in drain mode",
                         optedIn || alwaysAllowed);
             }