SERVER-38372 Fix rollback of index drop to update CollectionInfoCache.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/db/catalog/index_catalog_impl.cpp b/src/mongo/db/catalog/index_catalog_impl.cpp
index 52df6a8e887..bf8ff459588 100644
--- a/src/mongo/db/catalog/index_catalog_impl.cpp
+++ b/src/mongo/db/catalog/index_catalog_impl.cpp
@@ -849,8 +849,13 @@ public:
     }
 
     void rollback() final {
-        _collection->infoCache()->addedIndex(_opCtx, _entry->descriptor());
+        auto indexDescriptor = _entry->descriptor();
         _entries->add(std::move(_entry));
+
+        // Refresh the CollectionInfoCache's knowledge of what indices are present. This must be
+        // done after re-adding our IndexCatalogEntry to the '_entries' list, since 'addedIndex()'
+        // refreshes its knowledge by iterating the list of indices currently in the catalog.
+        _collection->infoCache()->addedIndex(_opCtx, indexDescriptor);
     }
 
 private: