Revert "SERVER-38696 Add additional metrics and logging for new step down sequence."

This reverts commit 6089c4c1d8f166b6b61cec980672779b7cedc303.

1 files changed, 8 insertions, 45 deletions

diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp
index a02c831bfb0..64edc5ef272 100644
--- a/src/mongo/db/service_entry_point_common.cpp
+++ b/src/mongo/db/service_entry_point_common.cpp
@@ -45,7 +45,6 @@
 #include "mongo/db/commands/test_commands_enabled.h"
 #include "mongo/db/concurrency/global_lock_acquisition_tracker.h"
 #include "mongo/db/curop.h"
-#include "mongo/db/curop_failpoint_helpers.h"
 #include "mongo/db/curop_metrics.h"
 #include "mongo/db/cursor_manager.h"
 #include "mongo/db/dbdirectclient.h"
@@ -99,19 +98,6 @@ namespace mongo {
 MONGO_FAIL_POINT_DEFINE(rsStopGetMore);
 MONGO_FAIL_POINT_DEFINE(respondWithNotPrimaryInCommandDispatch);
 MONGO_FAIL_POINT_DEFINE(skipCheckingForNotMasterInCommandDispatch);
-MONGO_FAIL_POINT_DEFINE(waitAfterReadCommandFinishesExecution);
-
-// 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);
-
-// Tracks the number of times an unacknowledged write failed due to not master error
-// resulted in network disconnection.
-Counter64 notMasterUnackWrites;
-ServerStatusMetricField<Counter64> displayNotMasterUnackWrites(
-    "repl.network.notMasterUnacknowledgedWrites", &notMasterUnackWrites);
 
 namespace {
 using logger::LogComponent;
@@ -464,16 +450,6 @@ bool runCommandImpl(OperationContext* opCtx,
                 opCtx, invocation, txnParticipant, sessionOptions, replyBuilder);
         } else {
             invocation->run(opCtx, replyBuilder);
-            MONGO_FAIL_POINT_BLOCK(waitAfterReadCommandFinishesExecution, options) {
-                const BSONObj& data = options.getData();
-                auto db = data["db"].str();
-                if (db.empty() || request.getDatabase() == db) {
-                    CurOpFailpointHelpers::waitWhileFailPointEnabled(
-                        &waitAfterReadCommandFinishesExecution,
-                        opCtx,
-                        "waitAfterReadCommandFinishesExecution");
-                }
-            }
         }
     } else {
         auto wcResult = uassertStatusOK(extractWriteConcern(opCtx, request.body));
@@ -887,8 +863,8 @@ DbResponse receivedCommands(OperationContext* opCtx,
                             const Message& message,
                             const ServiceEntryPointCommon::Hooks& behaviors) {
     auto replyBuilder = rpc::makeReplyBuilder(rpc::protocolForMessage(message));
-    OpMsgRequest request;
     [&] {
+        OpMsgRequest request;
         try {  // Parse.
             request = rpc::opMsgRequestFromAnyProtocol(message);
         } catch (const DBException& ex) {
@@ -958,16 +934,10 @@ DbResponse receivedCommands(OperationContext* opCtx,
 
     if (OpMsg::isFlagSet(message, OpMsg::kMoreToCome)) {
         // Close the connection to get client to go through server selection again.
-        if (LastError::get(opCtx->getClient()).hadNotMasterError()) {
-            notMasterUnackWrites.increment();
-            uasserted(ErrorCodes::NotMaster,
-                      str::stream() << "Not-master error while processing '"
-                                    << request.getCommandName()
-                                    << "' operation  on '"
-                                    << request.getDatabase()
-                                    << "' database via "
-                                    << "fire-and-forget command execution.");
-        }
+        uassert(ErrorCodes::NotMaster,
+                "Not-master error during fire-and-forget command processing",
+                !LastError::get(opCtx->getClient()).hadNotMasterError());
+
         return {};  // Don't reply.
     }
 
@@ -1283,16 +1253,9 @@ DbResponse ServiceEntryPointCommon::handleRequest(OperationContext* opCtx,
         // A NotMaster error can be set either within receivedInsert/receivedUpdate/receivedDelete
         // or within the AssertionException handler above.  Either way, we want to throw an
         // exception here, which will cause the client to be disconnected.
-        if (LastError::get(opCtx->getClient()).hadNotMasterError()) {
-            notMasterLegacyUnackWrites.increment();
-            uasserted(ErrorCodes::NotMaster,
-                      str::stream() << "Not-master error while processing '"
-                                    << networkOpToString(op)
-                                    << "' operation  on '"
-                                    << nsString
-                                    << "' namespace via legacy "
-                                    << "fire-and-forget command execution.");
-        }
+        uassert(ErrorCodes::NotMaster,
+                "Not-master error during legacy fire-and-forget command processing",
+                !LastError::get(opCtx->getClient()).hadNotMasterError());
     }
 
     // Mark the op as complete, and log it if appropriate. Returns a boolean indicating whether