SERVER-52833 Perform capped deletes during startup recovery on documents inserted earlier in startup recovery

2 files changed, 10 insertions, 1 deletions

diff --git a/src/mongo/db/server_recovery.h b/src/mongo/db/server_recovery.h
index 58eb0b133ae..45e79385053 100644
--- a/src/mongo/db/server_recovery.h
+++ b/src/mongo/db/server_recovery.h
@@ -83,7 +83,7 @@ public:
 
 private:
     mutable stdx::mutex _mutex;
-    std::set<std::string> _collectionsAlwaysNeedingSizeAdjustment;
+    stdx::unordered_set<std::string> _collectionsAlwaysNeedingSizeAdjustment;
 };
 
 /**
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
index c77b440b6ec..c440e25b043 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
@@ -1718,6 +1718,15 @@ void WiredTigerRecordStore::_initNextIdIfNeeded(OperationContext* opCtx) {
         return;
     }
 
+    // During startup recovery, the collectionAlwaysNeedsSizeAdjustment flag is not set by default
+    // for the sake of efficiency. However, if we reach this point, we may need to set it in order
+    // to ensure that capped deletes can occur on documents inserted earlier in startup recovery.
+    if (inReplicationRecovery(getGlobalServiceContext()) &&
+        !sizeRecoveryState(getGlobalServiceContext())
+             .collectionAlwaysNeedsSizeAdjustment(getIdent())) {
+        checkSize(opCtx);
+    }
+
     // Need to start at 1 so we are always higher than RecordId::min()
     int64_t nextId = 1;