SERVER-114535 Fix checkNoCollectionsInUse failure in _findOrDeleteDoc… (#45293)

GitOrigin-RevId: 51dd8e744c9538a1b6f942c9e9d3b760925352ee

Author: pierre-turin-mongodb

src/mongo/db/repl/storage_interface_impl.cpp

@@ -688,21 +688,10 @@ StatusWith<std::vector<BSONObj>> _findOrDeleteDocuments(
     BoundInclusion boundInclusion,
     std::size_t limit,
     FindDeleteMode mode) {
-    auto isFind = mode == FindDeleteMode::kFind;
+    const bool isFind = mode == FindDeleteMode::kFind;
     auto opStr = isFind ? "StorageInterfaceImpl::find" : "StorageInterfaceImpl::delete";
 
-#ifdef MONGO_CONFIG_DEBUG_BUILD
-    // TODO SERVER-114535: If a lock-free read is active and we enter this function the operation
-    // could force us to abandon the snapshot opened. This could cause the acquisition held above
-    // this call to become invalid by accident. We disable the checks temporarily until a more
-    // permanent fix is in place.
-    boost::optional<DisableCollectionConsistencyChecks> disableChecks;
-    if (isFind) {
-        disableChecks.emplace(opCtx);
-    }
-#endif
-
-    return writeConflictRetry(opCtx, opStr, nsOrUUID, [&]() -> StatusWith<std::vector<BSONObj>> {
+    auto doFindOrDeleteDocuments = [&]() -> StatusWith<std::vector<BSONObj>> {
         // We need to explicitly use this in a few places to help the type inference.  Use a
         // shorthand.
         using Result = StatusWith<std::vector<BSONObj>>;
@@ -878,7 +867,10 @@ StatusWith<std::vector<BSONObj>> _findOrDeleteDocuments(
         }
 
         return Result{docs};
-    });
+    };
+
+    return isFind ? doFindOrDeleteDocuments()
+                  : writeConflictRetry(opCtx, opStr, nsOrUUID, doFindOrDeleteDocuments);
 }
 
 StatusWith<BSONObj> _findOrDeleteById(OperationContext* opCtx,