SERVER-49301 repairDatabasesAndCheckVersion() accepts previous server shutdown state

4 files changed, 20 insertions, 9 deletions

diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index 0c24730d523..4a13a44fde8 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -445,7 +445,8 @@ ExitCode _initAndListen(ServiceContext* serviceContext, int listenPort) {
     auto startupOpCtx = serviceContext->makeOperationContext(&cc());
 
     try {
-        startup_recovery::repairAndRecoverDatabases(startupOpCtx.get());
+        startup_recovery::repairAndRecoverDatabases(startupOpCtx.get(),
+                                                    lastStorageEngineShutdownState);
     } catch (const ExceptionFor<ErrorCodes::MustDowngrade>& error) {
         LOGV2_FATAL_OPTIONS(
             20573,
diff --git a/src/mongo/db/startup_recovery.cpp b/src/mongo/db/startup_recovery.cpp
index 9e0e5bed487..80a8376154a 100644
--- a/src/mongo/db/startup_recovery.cpp
+++ b/src/mongo/db/startup_recovery.cpp
@@ -332,8 +332,10 @@ void assertCappedOplog(OperationContext* opCtx, Database* db) {
     }
 }
 
-void reconcileCatalogAndRebuildUnfinishedIndexes(OperationContext* opCtx,
-                                                 StorageEngine* storageEngine) {
+void reconcileCatalogAndRebuildUnfinishedIndexes(
+    OperationContext* opCtx,
+    StorageEngine* storageEngine,
+    LastStorageEngineShutdownState lastStorageEngineShutdownState) {
     auto reconcileResult = fassert(40593, storageEngine->reconcileCatalogAndIdents(opCtx));
 
     // Determine which indexes need to be rebuilt. rebuildIndexesOnCollection() requires that all
@@ -511,7 +513,9 @@ void startupRecoveryReadOnly(OperationContext* opCtx, StorageEngine* storageEngi
 }
 
 // Perform routine startup recovery procedure.
-void startupRecovery(OperationContext* opCtx, StorageEngine* storageEngine) {
+void startupRecovery(OperationContext* opCtx,
+                     StorageEngine* storageEngine,
+                     LastStorageEngineShutdownState lastStorageEngineShutdownState) {
     invariant(!storageGlobalParams.readOnly && !storageGlobalParams.repair);
 
     // Determine whether this is a replica set node running in standalone mode. This must be set
@@ -523,7 +527,8 @@ void startupRecovery(OperationContext* opCtx, StorageEngine* storageEngine) {
 
     // Drops abandoned idents. Rebuilds unfinished indexes and restarts incomplete two-phase
     // index builds.
-    reconcileCatalogAndRebuildUnfinishedIndexes(opCtx, storageEngine);
+    reconcileCatalogAndRebuildUnfinishedIndexes(
+        opCtx, storageEngine, lastStorageEngineShutdownState);
 
     const auto& replSettings = repl::ReplicationCoordinator::get(opCtx)->getSettings();
 
@@ -563,7 +568,8 @@ namespace startup_recovery {
  * Recovers or repairs all databases from a previous shutdown. May throw a MustDowngrade error
  * if data files are incompatible with the current binary version.
  */
-void repairAndRecoverDatabases(OperationContext* opCtx) {
+void repairAndRecoverDatabases(OperationContext* opCtx,
+                               LastStorageEngineShutdownState lastStorageEngineShutdownState) {
     auto const storageEngine = opCtx->getServiceContext()->getStorageEngine();
     Lock::GlobalWrite lk(opCtx);
 
@@ -579,7 +585,7 @@ void repairAndRecoverDatabases(OperationContext* opCtx) {
     } else if (storageGlobalParams.readOnly) {
         startupRecoveryReadOnly(opCtx, storageEngine);
     } else {
-        startupRecovery(opCtx, storageEngine);
+        startupRecovery(opCtx, storageEngine, lastStorageEngineShutdownState);
     }
 
     assertFilesCompatible(opCtx, storageEngine);
diff --git a/src/mongo/db/startup_recovery.h b/src/mongo/db/startup_recovery.h
index c2ccb7d45cb..4e563e0c04a 100644
--- a/src/mongo/db/startup_recovery.h
+++ b/src/mongo/db/startup_recovery.h
@@ -29,6 +29,8 @@
 
 #pragma once
 
+#include "mongo/db/storage/storage_engine_init.h"  // for LastStorageEngineShutdownState
+
 namespace mongo {
 class OperationContext;
 
@@ -38,7 +40,8 @@ namespace startup_recovery {
  * Recovers or repairs all databases from a previous shutdown. May throw a MustDowngrade error
  * if data files are incompatible with the current binary version.
  */
-void repairAndRecoverDatabases(OperationContext* opCtx);
+void repairAndRecoverDatabases(OperationContext* opCtx,
+                               LastStorageEngineShutdownState lastStorageEngineShutdownState);
 }  // namespace startup_recovery
 
 }  // namespace mongo
diff --git a/src/mongo/embedded/embedded.cpp b/src/mongo/embedded/embedded.cpp
index 8e3a768a3fd..e54348b15ec 100644
--- a/src/mongo/embedded/embedded.cpp
+++ b/src/mongo/embedded/embedded.cpp
@@ -291,7 +291,8 @@ ServiceContext* initialize(const char* yaml_config) {
     }
 
     try {
-        startup_recovery::repairAndRecoverDatabases(startupOpCtx.get());
+        startup_recovery::repairAndRecoverDatabases(startupOpCtx.get(),
+                                                    lastStorageEngineShutdownState);
     } catch (const ExceptionFor<ErrorCodes::MustDowngrade>& error) {
         LOGV2_FATAL_OPTIONS(22555,
                             logv2::LogOptions(LogComponent::kControl, logv2::FatalMode::kContinue),