SERVER-73351 remove WiredTigerKVEngine::_keepDataHistory

2 files changed, 1 insertions, 16 deletions

diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index c58ee92a70b..257e755c928 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -335,7 +335,6 @@ WiredTigerKVEngine::WiredTigerKVEngine(OperationContext* opCtx,
       _sizeStorerSyncTracker(cs, 100000, Seconds(60)),
       _ephemeral(ephemeral),
       _inRepairMode(repair),
-      _keepDataHistory(serverGlobalParams.enableMajorityReadConcern),
       _cacheSizeMB(cacheSizeMB) {
     _pinnedOplogTimestamp.store(Timestamp::max().asULL());
     boost::filesystem::path journalPath = path;
@@ -2311,9 +2310,6 @@ Timestamp WiredTigerKVEngine::getInitialDataTimestamp() const {
 }
 
 bool WiredTigerKVEngine::supportsRecoverToStableTimestamp() const {
-    if (!_keepDataHistory) {
-        return false;
-    }
     return true;
 }
 
@@ -2497,10 +2493,6 @@ Timestamp WiredTigerKVEngine::getPinnedOplog() const {
     }
 
     auto oplogNeededForCrashRecovery = getOplogNeededForCrashRecovery();
-    if (!_keepDataHistory) {
-        // We use rollbackViaRefetch, so we only need to pin oplog for crash recovery.
-        return std::min((oplogNeededForCrashRecovery.value_or(Timestamp::max())), pinned);
-    }
 
     if (oplogNeededForCrashRecovery) {
         return std::min(oplogNeededForCrashRecovery.value(), pinned);
@@ -2612,7 +2604,7 @@ bool WiredTigerKVEngine::supportsReadConcernSnapshot() const {
 }
 
 bool WiredTigerKVEngine::supportsReadConcernMajority() const {
-    return _keepDataHistory;
+    return true;
 }
 
 bool WiredTigerKVEngine::supportsOplogStones() const {
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
index ddc687f0190..911913c2080 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
@@ -509,13 +509,6 @@ private:
     bool _ephemeral;  // whether we are using the in-memory mode of the WT engine
     const bool _inRepairMode;
 
-    // If _keepDataHistory is true, then the storage engine keeps all history after the stable
-    // timestamp, and WiredTigerKVEngine is responsible for advancing the oldest timestamp. If
-    // _keepDataHistory is false (i.e. majority reads are disabled), then we only keep history after
-    // the "no holes point", and WiredTigerOplogManager is responsible for advancing the oldest
-    // timestamp.
-    const bool _keepDataHistory = true;
-
     std::unique_ptr<WiredTigerSessionSweeper> _sessionSweeper;
 
     std::string _rsOptions;