SERVER-47123 remove AutoGetOrCreateDb from IndexBuildsManager::_moveRecordToLostAndFound()

This affects repair functionality where we have to save duplicate keys to a local 'lost_and_found'
collection while repairing a unique index.

This commit also includes trivial changes to startup logging and the config.system.indexBuilds helper.

3 files changed, 35 insertions, 34 deletions

diff --git a/src/mongo/db/catalog/index_builds_manager.cpp b/src/mongo/db/catalog/index_builds_manager.cpp
index 479c0afef2c..8d4e3eb973a 100644
--- a/src/mongo/db/catalog/index_builds_manager.cpp
+++ b/src/mongo/db/catalog/index_builds_manager.cpp
@@ -393,7 +393,9 @@ StatusWith<int> IndexBuildsManager::_moveRecordToLostAndFound(
     const NamespaceString& nss,
     const NamespaceString& lostAndFoundNss,
     RecordId dupRecord) {
-    invariant(opCtx->lockState()->isCollectionLockedForMode(nss, MODE_IX));
+    invariant(opCtx->lockState()->isCollectionLockedForMode(nss, MODE_IX), nss.ns());
+    invariant(opCtx->lockState()->isCollectionLockedForMode(lostAndFoundNss, MODE_IX),
+              lostAndFoundNss.ns());
 
     auto catalog = CollectionCatalog::get(opCtx);
     auto originalCollection = catalog->lookupCollectionByNamespace(opCtx, nss);
@@ -403,12 +405,13 @@ StatusWith<int> IndexBuildsManager::_moveRecordToLostAndFound(
     if (!localCollection) {
         Status status =
             writeConflictRetry(opCtx, "createLostAndFoundCollection", lostAndFoundNss.ns(), [&]() {
-                WriteUnitOfWork wuow(opCtx);
-                AutoGetOrCreateDb autoDb(opCtx, NamespaceString::kLocalDb, MODE_X);
-                Database* db = autoDb.getDb();
+                AutoGetCollection autoColl(opCtx, lostAndFoundNss, MODE_IX);
 
                 // Ensure the database exists.
-                invariant(db);
+                auto db = autoColl.ensureDbExists();
+                invariant(db, lostAndFoundNss.ns());
+
+                WriteUnitOfWork wuow(opCtx);
 
                 // Since we are potentially deleting a document with duplicate _id values, we need
                 // to be able to insert into the lost and found collection without generating any
@@ -418,7 +421,7 @@ StatusWith<int> IndexBuildsManager::_moveRecordToLostAndFound(
                 localCollection = db->createCollection(opCtx, lostAndFoundNss, collOptions);
 
                 // Ensure the collection exists.
-                invariant(localCollection);
+                invariant(localCollection, lostAndFoundNss.ns());
 
                 wuow.commit();
                 return Status::OK();
diff --git a/src/mongo/db/index_build_entry_helpers.cpp b/src/mongo/db/index_build_entry_helpers.cpp
index efbf58cfccc..6a119e8f625 100644
--- a/src/mongo/db/index_build_entry_helpers.cpp
+++ b/src/mongo/db/index_build_entry_helpers.cpp
@@ -165,32 +165,30 @@ Status update(OperationContext* opCtx, const BSONObj& filter, const BSONObj& upd
 namespace indexbuildentryhelpers {
 
 void ensureIndexBuildEntriesNamespaceExists(OperationContext* opCtx) {
-    writeConflictRetry(opCtx,
-                       "createIndexBuildCollection",
-                       NamespaceString::kIndexBuildEntryNamespace.ns(),
-                       [&]() -> void {
-                           AutoGetOrCreateDb autoDb(
-                               opCtx, NamespaceString::kIndexBuildEntryNamespace.db(), MODE_X);
-                           Database* db = autoDb.getDb();
-
-                           // Ensure the database exists.
-                           invariant(db);
-
-                           // Create the collection if it doesn't exist.
-                           if (!CollectionCatalog::get(opCtx)->lookupCollectionByNamespace(
-                                   opCtx, NamespaceString::kIndexBuildEntryNamespace)) {
-                               WriteUnitOfWork wuow(opCtx);
-                               CollectionOptions defaultCollectionOptions;
-                               CollectionPtr collection =
-                                   db->createCollection(opCtx,
-                                                        NamespaceString::kIndexBuildEntryNamespace,
-                                                        defaultCollectionOptions);
-
-                               // Ensure the collection exists.
-                               invariant(collection);
-                               wuow.commit();
-                           }
-                       });
+    writeConflictRetry(
+        opCtx,
+        "createIndexBuildCollection",
+        NamespaceString::kIndexBuildEntryNamespace.ns(),
+        [&]() -> void {
+            AutoGetDb autoDb(opCtx, NamespaceString::kIndexBuildEntryNamespace.db(), MODE_X);
+            auto db = autoDb.ensureDbExists();
+
+            // Ensure the database exists.
+            invariant(db);
+
+            // Create the collection if it doesn't exist.
+            if (!CollectionCatalog::get(opCtx)->lookupCollectionByNamespace(
+                    opCtx, NamespaceString::kIndexBuildEntryNamespace)) {
+                WriteUnitOfWork wuow(opCtx);
+                CollectionOptions defaultCollectionOptions;
+                CollectionPtr collection = db->createCollection(
+                    opCtx, NamespaceString::kIndexBuildEntryNamespace, defaultCollectionOptions);
+
+                // Ensure the collection exists.
+                invariant(collection);
+                wuow.commit();
+            }
+        });
 }
 
 Status persistCommitReadyMemberInfo(OperationContext* opCtx,
diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index cd4ae044047..ee8b253fd70 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -263,8 +263,8 @@ void logStartup(OperationContext* opCtx) {
     BSONObj o = toLog.obj();
 
     Lock::GlobalWrite lk(opCtx);
-    AutoGetOrCreateDb autoDb(opCtx, startupLogCollectionName.db(), mongo::MODE_X);
-    Database* db = autoDb.getDb();
+    AutoGetDb autoDb(opCtx, startupLogCollectionName.db(), mongo::MODE_X);
+    auto db = autoDb.ensureDbExists();
     CollectionPtr collection =
         CollectionCatalog::get(opCtx)->lookupCollectionByNamespace(opCtx, startupLogCollectionName);
     WriteUnitOfWork wunit(opCtx);