SERVER-41813 Allow ViewCatalog lookup without validating system views

1 files changed, 7 insertions, 5 deletions

diff --git a/src/mongo/db/s/set_shard_version_command.cpp b/src/mongo/db/s/set_shard_version_command.cpp
index 0eb2fbde66c..8db4f26f347 100644
--- a/src/mongo/db/s/set_shard_version_command.cpp
+++ b/src/mongo/db/s/set_shard_version_command.cpp
@@ -222,15 +222,17 @@ public:
                     repl::ReplicationCoordinator::get(opCtx)->canAcceptWritesForDatabase(opCtx,
                                                                                          nss.db()));
 
-            // Views do not require a shard version check.
+            boost::optional<Lock::CollectionLock> collLock;
+            collLock.emplace(opCtx, nss, MODE_IS);
+
+            // Views do not require a shard version check. We do not care about invalid system views
+            // for this check, only to validate if a view already exists for this namespace.
             if (autoDb->getDb() && !autoDb->getDb()->getCollection(opCtx, nss) &&
-                ViewCatalog::get(autoDb->getDb())->lookup(opCtx, nss.ns())) {
+                ViewCatalog::get(autoDb->getDb())
+                    ->lookupWithoutValidatingDurableViews(opCtx, nss.ns())) {
                 return true;
             }
 
-            boost::optional<Lock::CollectionLock> collLock;
-            collLock.emplace(opCtx, nss, MODE_IS);
-
             auto* const css = CollectionShardingState::get(opCtx, nss);
             const ChunkVersion collectionShardVersion = [&] {
                 auto optMetadata = css->getCurrentMetadataIfKnown();