Revert "SERVER-30106 Allow syncTail replication to write to drop-pending collections"

This reverts commit d8afe01c37aa24bef255e8aea4ec6882df71b1dd.

1 files changed, 27 insertions, 27 deletions

diff --git a/src/mongo/db/namespace_string.cpp b/src/mongo/db/namespace_string.cpp
index eaf1fab39ff..b9cedd47a95 100644
--- a/src/mongo/db/namespace_string.cpp
+++ b/src/mongo/db/namespace_string.cpp
@@ -79,6 +79,33 @@ constexpr auto dropPendingNSPrefix = "system.drop."_sd;
 
 }  // namespace
 
+bool legalClientSystemNS(StringData ns) {
+    if (ns == "local.system.replset")
+        return true;
+
+    if (ns.find(".system.users") != string::npos)
+        return true;
+
+    if (ns == "admin.system.roles")
+        return true;
+    if (ns == kServerConfiguration)
+        return true;
+    if (ns == kLogicalTimeKeysCollection)
+        return true;
+    if (ns == "admin.system.new_users")
+        return true;
+    if (ns == "admin.system.backup_users")
+        return true;
+
+    if (ns.find(".system.js") != string::npos)
+        return true;
+
+    if (nsToCollectionSubstring(ns) == NamespaceString::kSystemDotViewsCollectionName)
+        return true;
+
+    return false;
+}
+
 constexpr StringData NamespaceString::kAdminDb;
 constexpr StringData NamespaceString::kLocalDb;
 constexpr StringData NamespaceString::kConfigDb;
@@ -102,33 +129,6 @@ bool NamespaceString::isCollectionlessAggregateNS() const {
     return coll() == collectionlessAggregateCursorCol;
 }
 
-bool NamespaceString::isLegalClientSystemNS() const {
-    if (db() == "admin") {
-        if (ns() == "admin.system.roles")
-            return true;
-        if (ns() == kServerConfiguration)
-            return true;
-        if (ns() == kLogicalTimeKeysCollection)
-            return true;
-        if (ns() == "admin.system.new_users")
-            return true;
-        if (ns() == "admin.system.backup_users")
-            return true;
-    }
-    if (ns() == "local.system.replset")
-        return true;
-
-    if (coll() == "system.users")
-        return true;
-    if (coll() == "system.js")
-        return true;
-
-    if (coll() == kSystemDotViewsCollectionName)
-        return true;
-
-    return false;
-}
-
 NamespaceString NamespaceString::makeListCollectionsNSS(StringData dbName) {
     NamespaceString nss(dbName, listCollectionsCursorCol);
     dassert(nss.isValid());