SERVER-81968 Make replica set endpoint handle the profile command and commands against the profiler collections through router code paths

Author: cheahuychou

src/mongo/db/replica_set_endpoint_util.cpp

@@ -29,12 +29,15 @@
 
 #include "mongo/db/replica_set_endpoint_util.h"
 
+#include "mongo/bson/bsontypes.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/multitenancy_gen.h"
+#include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/replica_set_endpoint_sharding_state.h"
 #include "mongo/db/s/replica_set_endpoint_feature_flag_gen.h"
 #include "mongo/s/grid.h"
+#include "mongo/util/namespace_string_util.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding
 
@@ -51,6 +54,21 @@ bool isInternalClient(OperationContext* opCtx) {
         opCtx->getClient()->isInDirectClient();
 }
 
+/**
+ * Returns true if this is a request for an unreplicated database or collection.
+ */
+bool isUnreplicatedDatabaseOrCollectionCommandRequest(const OpMsgRequest& opMsgReq) {
+    if (opMsgReq.getDbName().isLocalDB()) {
+        return true;
+    }
+    if (const auto& firstElement = opMsgReq.body.firstElement();
+        firstElement.type() == BSONType::String &&
+        firstElement.String() == NamespaceString::kSystemDotProfileCollectionName) {
+        return true;
+    }
+    return false;
+}
+
 /**
  * Returns true if this is a request for an aggregate command with a $currentOp stage.
  */
@@ -128,7 +146,7 @@ bool shouldRouteRequest(OperationContext* opCtx, const OpMsgRequest& opMsgReq) {
         return false;
     }
 
-    if (isInternalClient(opCtx) || opMsgReq.getDbName().isLocalDB() ||
+    if (isInternalClient(opCtx) || isUnreplicatedDatabaseOrCollectionCommandRequest(opMsgReq) ||
         isTargetedCommandRequest(opCtx, opMsgReq) || !isRoutableCommandRequest(opCtx, opMsgReq)) {
         return false;
     }

src/mongo/db/replica_set_endpoint_util.h

@@ -50,6 +50,7 @@ const std::set<StringData> kTargetedCmdNames = {"clearLog",
                                                 "ismaster",
                                                 "logout",
                                                 "ping",
+                                                "profile",
                                                 "refreshLogicalSessionCacheNow",
                                                 "replSetGetStatus",
                                                 "saslStart",

src/mongo/db/replica_set_endpoint_util_test.cpp

@@ -30,6 +30,7 @@
 
 #include "mongo/bson/json.h"
 #include "mongo/db/cluster_role.h"
+#include "mongo/db/database_name.h"
 #include "mongo/db/replica_set_endpoint_util.h"
 
 #include "mongo/util/database_name_util.h"
@@ -215,6 +216,87 @@ TEST_F(ReplicaSetEndpointUtilTest, ShouldRoute_AdminDatabase) {
     ASSERT(shouldRouteRequest(opCtx.get(), opMsgRequest));
 }
 
+TEST_F(ReplicaSetEndpointUtilTest, ShouldNotRoute_SystemDotProfileCollection) {
+    std::shared_ptr<transport::Session> session = getTransportLayer().createSession();
+    auto client =
+        getServiceContext()->getService()->makeClient("SystemDotProfileCollection", session);
+    auto opCtx = client->makeOperationContext();
+
+    auto dbName =
+        DatabaseName::createDatabaseName_forTest(boost::none /* tenantId */, {kTestDbName});
+    auto ns = NamespaceString::makeSystemDotProfileNamespace(dbName);
+    commands_test_example::ExampleIncrement incrementCmd(ns, 0);
+    auto opMsgRequest = mongo::OpMsgRequest::fromDBAndBody(ns.dbName(), incrementCmd.toBSON({}));
+
+    ASSERT_FALSE(shouldRouteRequest(opCtx.get(), opMsgRequest));
+}
+
+TEST_F(ReplicaSetEndpointUtilTest, ShouldRoute_ConfigSystemSessionsCollection) {
+    std::shared_ptr<transport::Session> session = getTransportLayer().createSession();
+    auto client =
+        getServiceContext()->getService()->makeClient("ConfigSystemSessionsCollection", session);
+    auto opCtx = client->makeOperationContext();
+
+    auto ns = NamespaceString::kLogicalSessionsNamespace;
+    commands_test_example::ExampleIncrement incrementCmd(ns, 0);
+    auto opMsgRequest = mongo::OpMsgRequest::fromDBAndBody(ns.dbName(), incrementCmd.toBSON({}));
+
+    ASSERT(shouldRouteRequest(opCtx.get(), opMsgRequest));
+}
+
+TEST_F(ReplicaSetEndpointUtilTest, ShouldRoute_AdminSystemUsersCollection) {
+    std::shared_ptr<transport::Session> session = getTransportLayer().createSession();
+    auto client =
+        getServiceContext()->getService()->makeClient("AdminSystemUsersCollection", session);
+    auto opCtx = client->makeOperationContext();
+
+    auto ns = NamespaceString::createNamespaceString_forTest(NamespaceString::kSystemUsers);
+    commands_test_example::ExampleIncrement incrementCmd(ns, 0);
+    auto opMsgRequest = mongo::OpMsgRequest::fromDBAndBody(ns.dbName(), incrementCmd.toBSON({}));
+
+    ASSERT(shouldRouteRequest(opCtx.get(), opMsgRequest));
+}
+
+TEST_F(ReplicaSetEndpointUtilTest, ShouldRoute_UserSystemCollection) {
+    std::shared_ptr<transport::Session> session = getTransportLayer().createSession();
+    auto client = getServiceContext()->getService()->makeClient("UserSystemCollection", session);
+    auto opCtx = client->makeOperationContext();
+
+    auto ns =
+        NamespaceString::createNamespaceString_forTest(kTestDbName, "system." + kTestCollName);
+    commands_test_example::ExampleIncrement incrementCmd(ns, 0);
+    auto opMsgRequest = mongo::OpMsgRequest::fromDBAndBody(ns.dbName(), incrementCmd.toBSON({}));
+
+    ASSERT(shouldRouteRequest(opCtx.get(), opMsgRequest));
+}
+
+TEST_F(ReplicaSetEndpointUtilTest, ShouldRoute_UserNonSystemCollection) {
+    std::shared_ptr<transport::Session> session = getTransportLayer().createSession();
+    auto client = getServiceContext()->getService()->makeClient("UserNonSystemCollection", session);
+    auto opCtx = client->makeOperationContext();
+
+    auto ns0 =
+        NamespaceString::createNamespaceString_forTest(kTestDbName, "system-" + kTestCollName);
+    commands_test_example::ExampleIncrement incrementCmd0(ns0, 0);
+    auto opMsgRequest0 = mongo::OpMsgRequest::fromDBAndBody(ns0.dbName(), incrementCmd0.toBSON({}));
+
+    ASSERT(shouldRouteRequest(opCtx.get(), opMsgRequest0));
+
+    auto ns1 =
+        NamespaceString::createNamespaceString_forTest(kTestDbName, kTestCollName + "system");
+    commands_test_example::ExampleIncrement incrementCmd1(ns1, 0);
+    auto opMsgRequest1 = mongo::OpMsgRequest::fromDBAndBody(ns1.dbName(), incrementCmd1.toBSON({}));
+
+    ASSERT(shouldRouteRequest(opCtx.get(), opMsgRequest1));
+
+    auto ns2 =
+        NamespaceString::createNamespaceString_forTest(kTestDbName, kTestCollName + ".system.foo");
+    commands_test_example::ExampleIncrement incrementCmd2(ns2, 0);
+    auto opMsgRequest2 = mongo::OpMsgRequest::fromDBAndBody(ns2.dbName(), incrementCmd2.toBSON({}));
+
+    ASSERT(shouldRouteRequest(opCtx.get(), opMsgRequest2));
+}
+
 TEST_F(ReplicaSetEndpointUtilTest, ShouldNotRoute_TargetedCommand) {
     std::shared_ptr<transport::Session> session = getTransportLayer().createSession();
     auto client = getServiceContext()->getService()->makeClient("TargetedCommand", session);