SERVER-65313 Use BatchedCollectionCatalogWriter during startup recovery

This allows writable Collections to be requested any time during
startup recovery without being in an active WUOW.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/mongo/db/startup_recovery.cpp b/src/mongo/db/startup_recovery.cpp
index 00a65cc7773..ca1b6fb94e0 100644
--- a/src/mongo/db/startup_recovery.cpp
+++ b/src/mongo/db/startup_recovery.cpp
@@ -469,11 +469,7 @@ void startupRepair(OperationContext* opCtx, StorageEngine* storageEngine) {
     ScopeGuard abortRepairOnFCVErrors(
         [&] { StorageRepairObserver::get(opCtx->getServiceContext())->onRepairDone(opCtx); });
 
-    // Use the BatchedCollectionCatalogWriter so all Collection writes to the in-memory catalog are
-    // done in a single copy-on-write of the catalog. This avoids quadratic behavior where we
-    // iterate over every collection and perform writes where the catalog would be copied every
-    // time.
-    BatchedCollectionCatalogWriter catalog(opCtx);
+    auto catalog = CollectionCatalog::get(opCtx);
     if (auto fcvColl = catalog->lookupCollectionByNamespace(
             opCtx, NamespaceString::kServerConfigurationNamespace)) {
         auto databaseHolder = DatabaseHolder::get(opCtx);
@@ -619,6 +615,12 @@ void repairAndRecoverDatabases(OperationContext* opCtx,
     auto const storageEngine = opCtx->getServiceContext()->getStorageEngine();
     Lock::GlobalWrite lk(opCtx);
 
+    // Use the BatchedCollectionCatalogWriter so all Collection writes to the in-memory catalog are
+    // done in a single copy-on-write of the catalog. This avoids quadratic behavior where we
+    // iterate over every collection and perform writes where the catalog would be copied every
+    // time.
+    BatchedCollectionCatalogWriter catalog(opCtx);
+
     // Create the FCV document for the first time, if necessary. Replica set nodes only initialize
     // the FCV when the replica set is first initiated or by data replication.
     const bool usingReplication = repl::ReplicationCoordinator::get(opCtx)->isReplEnabled();