SERVER-49846 Drop internal idents on startup if there are no index builds to resume

Author: lankas

jstests/noPassthrough/libs/index_build.js

@@ -575,6 +575,7 @@ const ResumableIndexBuildTest = class {
         // Ensure that the resumable index build failed as expected.
         if (failWhileParsing) {
             assert(RegExp("4916300.*").test(rawMongoProgramOutput()));
+            assert(RegExp("22257.*").test(rawMongoProgramOutput()));
         } else {
             assert(RegExp("4841701.*" + buildUUID).test(rawMongoProgramOutput()));
         }
@@ -584,5 +585,14 @@ const ResumableIndexBuildTest = class {
 
         ResumableIndexBuildTest.checkIndexes(
             rst, dbName, collName, indexName, postIndexBuildInserts);
+
+        // If we fail after parsing, any remaining internal idents will only be cleaned up after
+        // another restart.
+        if (!failWhileParsing) {
+            clearRawMongoProgramOutput();
+            rst.stop(primary);
+            rst.start(primary, {noCleanData: true});
+            assert(RegExp("22257.*").test(rawMongoProgramOutput()));
+        }
     }
 };

jstests/noPassthrough/restart_index_build_if_resume_fails.js

@@ -35,8 +35,6 @@ ResumableIndexBuildTest.runFailToResume(rst,
                                         [{a: 2}, {a: 3}],
                                         [{a: 4}, {a: 5}],
                                         true /* failWhileParsing */);
-assert.commandWorked(
-    primary.adminCommand({configureFailPoint: 'failToParseResumeIndexInfo', mode: 'off'}));
 
 ResumableIndexBuildTest.runFailToResume(
     rst, dbName, collName, {a: 1}, "failSetUpResumeIndexBuild", [{a: 6}, {a: 7}], [{a: 8}, {a: 9}]);

src/mongo/db/storage/storage_engine_impl.cpp

@@ -331,11 +331,14 @@ bool StorageEngineImpl::_handleInternalIdents(
     const std::string& ident,
     InternalIdentReconcilePolicy internalIdentReconcilePolicy,
     ReconcileResult* reconcileResult,
-    std::set<std::string>* internalIdentsToDrop) {
+    std::set<std::string>* internalIdentsToDrop,
+    std::set<std::string>* allInternalIdents) {
     if (!_catalog->isInternalIdent(ident)) {
         return false;
     }
 
+    allInternalIdents->insert(ident);
+
     if (InternalIdentReconcilePolicy::kDrop == internalIdentReconcilePolicy ||
         !supportsResumableIndexBuilds()) {
         internalIdentsToDrop->insert(ident);
@@ -378,8 +381,6 @@ bool StorageEngineImpl::_handleInternalIdents(
             reconcileResult->indexBuildsToResume.push_back(resumeInfo);
 
             // Once we have parsed the resume info, we can safely drop the internal ident.
-            // TODO SERVER-49846: revisit this logic since this could cause the side tables
-            // associated with the index build to be orphaned if resuming fails.
             internalIdentsToDrop->insert(ident);
 
             LOGV2(4916301,
@@ -435,6 +436,7 @@ StatusWith<StorageEngine::ReconcileResult> StorageEngineImpl::reconcileCatalogAn
         catalogIdents.insert(vec.begin(), vec.end());
     }
     std::set<std::string> internalIdentsToDrop;
+    std::set<std::string> allInternalIdents;
 
     auto dropPendingIdents = _dropPendingIdentReaper.getAllIdentNames();
 
@@ -446,8 +448,12 @@ StatusWith<StorageEngine::ReconcileResult> StorageEngineImpl::reconcileCatalogAn
             continue;
         }
 
-        if (_handleInternalIdents(
-                opCtx, it, internalIdentReconcilePolicy, &reconcileResult, &internalIdentsToDrop)) {
+        if (_handleInternalIdents(opCtx,
+                                  it,
+                                  internalIdentReconcilePolicy,
+                                  &reconcileResult,
+                                  &internalIdentsToDrop,
+                                  &allInternalIdents)) {
             continue;
         }
 
@@ -623,6 +629,11 @@ StatusWith<StorageEngine::ReconcileResult> StorageEngineImpl::reconcileCatalogAn
         }
     }
 
+    // If there are no index builds to resume, we should drop all internal idents.
+    if (reconcileResult.indexBuildsToResume.empty()) {
+        internalIdentsToDrop.swap(allInternalIdents);
+    }
+
     for (auto&& temp : internalIdentsToDrop) {
         LOGV2(22257, "Dropping internal ident", "ident"_attr = temp);
         WriteUnitOfWork wuow(opCtx);

src/mongo/db/storage/storage_engine_impl.h

@@ -388,7 +388,8 @@ class StorageEngineImpl final : public StorageEngineInterface, public StorageEng
                                const std::string& ident,
                                InternalIdentReconcilePolicy internalIdentReconcilePolicy,
                                ReconcileResult* reconcileResult,
-                               std::set<std::string>* internalIdentsToDrop);
+                               std::set<std::string>* internalIdentsToDrop,
+                               std::set<std::string>* allInternalIdents);
 
     class RemoveDBChange;