SERVER-47400 Disallow createCollection/Indexes on system colls in txns

(cherry picked from commit 76d4548a751a56c8faf1887114685b540203a650)

2 files changed, 9 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/create_collection.cpp b/src/mongo/db/catalog/create_collection.cpp
index f2f8d7b516b..1a863962c26 100644
--- a/src/mongo/db/catalog/create_collection.cpp
+++ b/src/mongo/db/catalog/create_collection.cpp
@@ -209,6 +209,10 @@ Status createCollection(OperationContext* opCtx,
                 !opCtx->inMultiDocumentTransaction());
         return _createView(opCtx, nss, collectionOptions, idIndex);
     } else {
+        uassert(ErrorCodes::OperationNotSupportedInTransaction,
+                str::stream() << "Cannot create system collection " << nss.toString()
+                              << " within a transaction.",
+                !opCtx->inMultiDocumentTransaction() || !nss.isSystem());
         return _createCollection(opCtx, nss, collectionOptions, idIndex);
     }
 }
diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp
index dfe7dd3ccb7..3f817295566 100644
--- a/src/mongo/db/commands/create_indexes.cpp
+++ b/src/mongo/db/commands/create_indexes.cpp
@@ -501,6 +501,11 @@ bool runCreateIndexesWithCoordinator(OperationContext* opCtx,
             str::stream() << "not allowed to create index on " << ns.ns(),
             ns != NamespaceString::kSessionTransactionsTableNamespace);
 
+    uassert(ErrorCodes::OperationNotSupportedInTransaction,
+            str::stream() << "Cannot write to system collection " << ns.toString()
+                          << " within a transaction.",
+            !opCtx->inMultiDocumentTransaction() || !ns.isSystem());
+
     auto specs = uassertStatusOK(
         parseAndValidateIndexSpecs(opCtx, ns, cmdObj, serverGlobalParams.featureCompatibility));
     auto replCoord = repl::ReplicationCoordinator::get(opCtx);