SERVER-14900 Log operations that exceed slowMs on mongoS

1 files changed, 16 insertions, 1 deletions

diff --git a/src/mongo/s/service_entry_point_mongos.cpp b/src/mongo/s/service_entry_point_mongos.cpp
index dc1f8312b97..7b2c10fbc9b 100644
--- a/src/mongo/s/service_entry_point_mongos.cpp
+++ b/src/mongo/s/service_entry_point_mongos.cpp
@@ -34,6 +34,7 @@
 
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
+#include "mongo/db/curop.h"
 #include "mongo/db/dbmessage.h"
 #include "mongo/db/lasterror.h"
 #include "mongo/db/operation_context.h"
@@ -84,12 +85,20 @@ DbResponse ServiceEntryPointMongos::handleRequest(OperationContext* opCtx, const
     LastError::get(client).startRequest();
     AuthorizationSession::get(opCtx->getClient())->startRequest(opCtx);
 
+    CurOp::get(opCtx)->ensureStarted();
+
     DbMessage dbm(message);
 
     // This is before the try block since it handles all exceptions that should not cause the
     // connection to close.
     if (op == dbMsg || (op == dbQuery && NamespaceString(dbm.getns()).isCommand())) {
-        return Strategy::clientCommand(opCtx, message);
+        auto dbResponse = Strategy::clientCommand(opCtx, message);
+
+        // Mark the op as complete, populate the response length, and log it if appropriate.
+        CurOp::get(opCtx)->completeAndLogOperation(
+            opCtx, logger::LogComponent::kCommand, dbResponse.response.size());
+
+        return dbResponse;
     }
 
     NamespaceString nss;
@@ -151,7 +160,13 @@ DbResponse ServiceEntryPointMongos::handleRequest(OperationContext* opCtx, const
 
         // We *always* populate the last error for now
         LastError::get(opCtx->getClient()).setLastError(ex.code(), ex.what());
+        CurOp::get(opCtx)->debug().errInfo = ex.toStatus();
     }
+
+    // Mark the op as complete, populate the response length, and log it if appropriate.
+    CurOp::get(opCtx)->completeAndLogOperation(
+        opCtx, logger::LogComponent::kCommand, dbResponse.response.size());
+
     return dbResponse;
 }