SERVER-46640 The TTLMonitor should not remove the cached index information from the TTLCollectionCache when a collection is not yet visible

2 files changed, 12 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/collection_catalog.cpp b/src/mongo/db/catalog/collection_catalog.cpp
index ec80653054a..bdb5018016f 100644
--- a/src/mongo/db/catalog/collection_catalog.cpp
+++ b/src/mongo/db/catalog/collection_catalog.cpp
@@ -268,6 +268,12 @@ void CollectionCatalog::makeCollectionVisible(CollectionUUID uuid) {
     coll->setCommitted(true);
 }
 
+bool CollectionCatalog::isCollectionAwaitingVisibility(CollectionUUID uuid) const {
+    stdx::lock_guard<Latch> lock(_catalogLock);
+    auto coll = _lookupCollectionByUUID(lock, uuid);
+    return coll && !coll->isCommitted();
+}
+
 Collection* CollectionCatalog::_lookupCollectionByUUID(WithLock, CollectionUUID uuid) const {
     auto foundIt = _catalog.find(uuid);
     return foundIt == _catalog.end() ? nullptr : foundIt->second.get();
diff --git a/src/mongo/db/catalog/collection_catalog.h b/src/mongo/db/catalog/collection_catalog.h
index d9ddac71fb1..23d0bf88b25 100644
--- a/src/mongo/db/catalog/collection_catalog.h
+++ b/src/mongo/db/catalog/collection_catalog.h
@@ -146,6 +146,12 @@ public:
     void makeCollectionVisible(CollectionUUID uuid);
 
     /**
+     * Returns true if the collection has been registered in the CollectionCatalog but not yet made
+     * visible.
+     */
+    bool isCollectionAwaitingVisibility(CollectionUUID uuid) const;
+
+    /**
      * This function gets the Collection pointer that corresponds to the NamespaceString.
      * The required locks must be obtained prior to calling this function, or else the found
      * Collection pointer may no longer be valid when the call returns.