SERVER-50416 Change notMasterLegacyUnacknowledgedWrites to notPrimaryLegacyUnacknowledgedWrites in serverStatus

(cherry picked from commit 759787fd5a1a28ed3293a869e9e1b1e11cb6337a)

3 files changed, 11 insertions, 9 deletions

diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml
index 28201a2745a..09166bdd011 100644
--- a/etc/backports_required_for_multiversion_tests.yml
+++ b/etc/backports_required_for_multiversion_tests.yml
@@ -91,6 +91,8 @@ all:
     test_file: jstests/replsets/read_operations_during_rollback.js
   - ticket: SERVER-51262
     test_file: jstests/replsets/transactions_on_secondaries_not_allowed.js
+  - ticket: SERVER-50416
+    test_file: jstests/replsets/disconnect_on_legacy_write_to_secondary.js
 
 suites:
 
diff --git a/jstests/replsets/disconnect_on_legacy_write_to_secondary.js b/jstests/replsets/disconnect_on_legacy_write_to_secondary.js
index edf5950a62b..9678fc1a98e 100644
--- a/jstests/replsets/disconnect_on_legacy_write_to_secondary.js
+++ b/jstests/replsets/disconnect_on_legacy_write_to_secondary.js
@@ -52,16 +52,16 @@ const primaryDb = primaryDataConn.getDB("test");
 const primaryColl = primaryDb[collname];
 primaryDataConn.forceWriteMode('legacy');
 
-function getNotMasterLegacyUnackWritesCounter() {
+function getNotPrimaryLegacyUnackWritesCounter() {
     return assert.commandWorked(primaryAdmin.adminCommand({serverStatus: 1}))
-        .metrics.repl.network.notMasterLegacyUnacknowledgedWrites;
+        .metrics.repl.network.notPrimaryLegacyUnacknowledgedWrites;
 }
 
 function runStepDownTest({description, failpoint, operation}) {
     jsTestLog("Enabling failpoint to block " + description + "s");
     let failPoint = configureFailPoint(primaryAdmin, failpoint);
 
-    let failedLegacyUnackWritesBefore = getNotMasterLegacyUnackWritesCounter();
+    let failedLegacyUnackWritesBefore = getNotPrimaryLegacyUnackWritesCounter();
 
     jsTestLog("Trying legacy " + description + " on stepping-down primary");
     operation();
@@ -77,7 +77,7 @@ function runStepDownTest({description, failpoint, operation}) {
 
     // Validate the number of legacy unacknowledged writes failed due to step down resulted
     // in network disconnection.
-    let failedLegacyUnackWritesAfter = getNotMasterLegacyUnackWritesCounter();
+    let failedLegacyUnackWritesAfter = getNotPrimaryLegacyUnackWritesCounter();
     assert.eq(failedLegacyUnackWritesAfter, failedLegacyUnackWritesBefore + 1);
 
     // Allow the primary to be re-elected, and wait for it.
diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp
index bab37e0f2e1..ff5153ed627 100644
--- a/src/mongo/db/service_entry_point_common.cpp
+++ b/src/mongo/db/service_entry_point_common.cpp
@@ -114,10 +114,10 @@ MONGO_FAIL_POINT_DEFINE(waitAfterCommandFinishesExecution);
 MONGO_FAIL_POINT_DEFINE(failWithErrorCodeInRunCommand);
 
 // Tracks the number of times a legacy unacknowledged write failed due to
-// not master error resulted in network disconnection.
-Counter64 notMasterLegacyUnackWrites;
-ServerStatusMetricField<Counter64> displayNotMasterLegacyUnackWrites(
-    "repl.network.notMasterLegacyUnacknowledgedWrites", &notMasterLegacyUnackWrites);
+// not primary error resulted in network disconnection.
+Counter64 notPrimaryLegacyUnackWrites;
+ServerStatusMetricField<Counter64> displayNotPrimaryLegacyUnackWrites(
+    "repl.network.notPrimaryLegacyUnacknowledgedWrites", &notPrimaryLegacyUnackWrites);
 
 // Tracks the number of times an unacknowledged write failed due to not master error
 // resulted in network disconnection.
@@ -1781,7 +1781,7 @@ DbResponse ServiceEntryPointCommon::handleRequest(OperationContext* opCtx,
         // above.  Either way, we want to throw an exception here, which will cause the client to be
         // disconnected.
         if (LastError::get(opCtx->getClient()).hadNotPrimaryError()) {
-            notMasterLegacyUnackWrites.increment();
+            notPrimaryLegacyUnackWrites.increment();
             uasserted(ErrorCodes::NotWritablePrimary,
                       str::stream()
                           << "Not-master error while processing '" << networkOpToString(op)