SERVER-49301 StorageEngineImpl::reconcileCatalogAndIdents() accepts policy for internal idents instead of checking unclean shutdown decorator

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/startup_recovery.cpp b/src/mongo/db/startup_recovery.cpp
index 80a8376154a..c7be25d6e87 100644
--- a/src/mongo/db/startup_recovery.cpp
+++ b/src/mongo/db/startup_recovery.cpp
@@ -336,7 +336,15 @@ void reconcileCatalogAndRebuildUnfinishedIndexes(
     OperationContext* opCtx,
     StorageEngine* storageEngine,
     LastStorageEngineShutdownState lastStorageEngineShutdownState) {
-    auto reconcileResult = fassert(40593, storageEngine->reconcileCatalogAndIdents(opCtx));
+
+    // When starting up after an unclean shutdown, we do not attempt to recover any state from the
+    // internal idents. Thus, we drop them in this case.
+    auto reconcilePolicy =
+        LastStorageEngineShutdownState::kUnclean == lastStorageEngineShutdownState
+        ? StorageEngine::InternalIdentReconcilePolicy::kDrop
+        : StorageEngine::InternalIdentReconcilePolicy::kRetain;
+    auto reconcileResult =
+        fassert(40593, storageEngine->reconcileCatalogAndIdents(opCtx, reconcilePolicy));
 
     // Determine which indexes need to be rebuilt. rebuildIndexesOnCollection() requires that all
     // indexes on that collection are done at once, so we use a map to group them together.