New upstream version 6.0.20upstream

1 files changed, 17 insertions, 7 deletions

diff --git a/src/mongo/db/catalog/validate_state.cpp b/src/mongo/db/catalog/validate_state.cpp
index f40ebe0062e..01f80ac61cc 100644
--- a/src/mongo/db/catalog/validate_state.cpp
+++ b/src/mongo/db/catalog/validate_state.cpp
@@ -81,16 +81,26 @@ ValidateState::ValidateState(OperationContext* opCtx,
         _collection = CollectionCatalog::get(opCtx)->lookupCollectionByNamespace(opCtx, _nss);
 
     if (!_collection) {
-        if (CollectionCatalog::get(opCtx)->lookupView(opCtx, _nss)) {
-            uasserted(ErrorCodes::CommandNotSupportedOnView, "Cannot validate a view");
+        auto view = CollectionCatalog::get(opCtx)->lookupView(opCtx, _nss);
+        if (!view) {
+            uasserted(ErrorCodes::NamespaceNotFound,
+                      str::stream() << "Collection '" << _nss << "' does not exist to validate.");
+        } else {
+            // Uses the bucket collection in place of the time-series collection view.
+            if (!view->timeseries()) {
+                uasserted(ErrorCodes::CommandNotSupportedOnView, "Cannot validate a view");
+            }
+            _nss = _nss.makeTimeseriesBucketsNamespace();
+            if (isBackground()) {
+                _collectionLock.emplace(opCtx, _nss, MODE_IS);
+            } else {
+                _collectionLock.emplace(opCtx, _nss, MODE_X);
+            }
+            _collection = CollectionCatalog::get(opCtx)->lookupCollectionByNamespace(opCtx, _nss);
         }
-
-        uasserted(ErrorCodes::NamespaceNotFound,
-                  str::stream() << "Collection '" << _nss << "' does not exist to validate.");
     }
 
-    // Return warnings instead of errors on schema validation failures.
-    _warnOnSchemaValidation = additionalOptions.warnOnSchemaValidation;
+    _validationVersion = additionalOptions.validationVersion;
 
     // RepairMode is incompatible with the ValidateModes kBackground and
     // kForegroundFullEnforceFastCount.