Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mongo/db/commands/validate_db_metadata_cmd.cpp b/src/mongo/db/commands/validate_db_metadata_cmd.cpp
index 737bec2a1e7..c3a00ff74e6 100644
--- a/src/mongo/db/commands/validate_db_metadata_cmd.cpp
+++ b/src/mongo/db/commands/validate_db_metadata_cmd.cpp
@@ -149,10 +149,12 @@ public:
                         return _validateView(opCtx, view);
                     });
 
-                for (auto&& coll : collectionCatalog->range(tenantDbName)) {
+                for (auto collIt = collectionCatalog->begin(opCtx, tenantDbName);
+                     collIt != collectionCatalog->end(opCtx);
+                     ++collIt) {
                     if (!_validateNamespace(
                             opCtx,
-                            collectionCatalog->lookupNSSByUUID(opCtx, coll->uuid()).value())) {
+                            collectionCatalog->lookupNSSByUUID(opCtx, collIt.uuid().get()).get())) {
                         return;
                     }
                 }
@@ -213,10 +215,8 @@ public:
 
             // Ensure there are no unstable indexes.
             const auto* indexCatalog = collection->getIndexCatalog();
-            auto ii = indexCatalog->getIndexIterator(
-                opCtx,
-                IndexCatalog::InclusionPolicy::kReady | IndexCatalog::InclusionPolicy::kUnfinished |
-                    IndexCatalog::InclusionPolicy::kFrozen);
+            std::unique_ptr<IndexCatalog::IndexIterator> ii =
+                indexCatalog->getIndexIterator(opCtx, true /* includeUnfinishedIndexes */);
             while (ii->more()) {
                 // Check if the index is allowed in API version 1.
                 const IndexDescriptor* desc = ii->next()->descriptor();