Revert "SERVER-45975: Added --oplogMinRetention cli option"

This reverts commit 0f54376c08d368ffcc80f65a0a4271cc0e6e865a.

 delete mode 100644 jstests/noPassthrough/oplog_retention_hours.js

6 files changed, 9 insertions, 50 deletions

diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 9d0030df49e..d6b4b733e51 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -528,16 +528,6 @@ Status storeMongodOptions(const moe::Environment& params) {
         invariant(replSettings.getOplogSizeBytes() > 0);
     }
 
-    if (params.count("storage.oplogMinRetentionHours")) {
-        storageGlobalParams.oplogMinRetentionHours.store(
-            params["storage.oplogMinRetentionHours"].as<double>());
-        if (storageGlobalParams.oplogMinRetentionHours.load() < 0) {
-            return Status(ErrorCodes::BadValue,
-                          "bad --oplogMinRetentionHours, argument must be greater or equal to 0");
-        }
-        invariant(storageGlobalParams.oplogMinRetentionHours.load() >= 0);
-    }
-
     if (params.count("cacheSize")) {
         long x = params["cacheSize"].as<long>();
         if (x <= 0) {
diff --git a/src/mongo/db/mongod_options_storage.idl b/src/mongo/db/mongod_options_storage.idl
index 116ad5ecacf..8c51c9e7295 100644
--- a/src/mongo/db/mongod_options_storage.idl
+++ b/src/mongo/db/mongod_options_storage.idl
@@ -122,11 +122,3 @@ configs:
         deprecated_short_name: nodur
         arg_vartype: Switch
         source: [ cli, ini ]
-
-    'storage.oplogMinRetentionHours':
-        description: 'Minimum number of hours to preserve in the oplog. Default is 0 (turned off). Fractions are allowed (e.g. 1.5 hours)'
-        short_name: oplogMinRetentionHours
-        arg_vartype: Double
-        default: 0.0
-        validator:
-            gte: 0.0
diff --git a/src/mongo/db/storage/storage_options.cpp b/src/mongo/db/storage/storage_options.cpp
index f9eda312535..5cc702e1302 100644
--- a/src/mongo/db/storage/storage_options.cpp
+++ b/src/mongo/db/storage/storage_options.cpp
@@ -55,7 +55,6 @@ void StorageGlobalParams::reset() {
     syncdelay = 60.0;
     readOnly = false;
     groupCollections = false;
-    oplogMinRetentionHours.store(0.0);
 }
 
 StorageGlobalParams storageGlobalParams;
diff --git a/src/mongo/db/storage/storage_options.h b/src/mongo/db/storage/storage_options.h
index 4202cbc10ef..ceec92d42fb 100644
--- a/src/mongo/db/storage/storage_options.h
+++ b/src/mongo/db/storage/storage_options.h
@@ -110,12 +110,6 @@ struct StorageGlobalParams {
     // workloads that rely heavily on creating many collections within a database.
     bool groupCollections;
 
-    // --oplogMinRetentionHours
-    // Controls what size the oplog should be in addition to oplogSize. If set, the oplog will only
-    // be truncated if it is over the capped size, and if the bucket of oldest oplog entries fall
-    // outside of the retention window which is set by this option.
-    AtomicWord<double> oplogMinRetentionHours;
-
     // Controls whether we allow the OplogStones mechanism to delete oplog history on WT.
     bool allowOplogTruncation = true;
 };
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
index fd2c083edca..235cb8f057e 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
@@ -49,7 +49,6 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/repl/repl_settings.h"
-#include "mongo/db/repl/replication_coordinator.h"
 #include "mongo/db/server_recovery.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/storage/oplog_hack.h"
@@ -86,8 +85,6 @@ static const int kMaximumRecordStoreVersion = 1;
 MONGO_STATIC_ASSERT(kCurrentRecordStoreVersion >= kMinimumRecordStoreVersion);
 MONGO_STATIC_ASSERT(kCurrentRecordStoreVersion <= kMaximumRecordStoreVersion);
 
-const double kNumSecsInHour = 3600.0;
-
 void checkOplogFormatVersion(OperationContext* opCtx, const std::string& uri) {
     StatusWith<BSONObj> appMetadata = WiredTigerUtil::getApplicationMetadata(opCtx, uri);
     fassert(39999, appMetadata);
@@ -229,27 +226,6 @@ void WiredTigerRecordStore::OplogStones::awaitHasExcessStonesOrDead() {
     }
 }
 
-bool WiredTigerRecordStore::OplogStones::hasExcessStones_inlock() const {
-    int64_t totalBytes = 0;
-    for (auto&& stone : _stones) {
-        totalBytes += stone.bytes;
-    }
-
-    // check that oplog stones is at capacity
-    if (totalBytes <= _rs->cappedMaxSize()) {
-        return false;
-    }
-
-    double minRetentionHours = storageGlobalParams.oplogMinRetentionHours.load();
-
-    auto rc = repl::ReplicationCoordinator::get(getGlobalServiceContext());
-    double lastAppliedTs = rc->getMyLastAppliedOpTime().getTimestamp().getSecs();
-    double lastStoneTs = Timestamp(_stones.front().lastRecord.repr()).getSecs();
-
-    double currRetentionHours = (lastAppliedTs - lastStoneTs) / kNumSecsInHour;
-    return currRetentionHours >= minRetentionHours;
-}
-
 boost::optional<WiredTigerRecordStore::OplogStones::Stone>
 WiredTigerRecordStore::OplogStones::peekOldestStoneIfNeeded() const {
     stdx::lock_guard<Latch> lk(_mutex);
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_oplog_stones.h b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_oplog_stones.h
index 15950177e74..0dcb844f1d0 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_oplog_stones.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_oplog_stones.h
@@ -57,7 +57,15 @@ public:
 
     void kill();
 
-    bool hasExcessStones_inlock() const;
+    bool hasExcessStones_inlock() const {
+        int64_t total_bytes = 0;
+        for (std::deque<OplogStones::Stone>::const_iterator it = _stones.begin();
+             it != _stones.end();
+             ++it) {
+            total_bytes += it->bytes;
+        }
+        return total_bytes > _rs->cappedMaxSize();
+    }
 
     void awaitHasExcessStonesOrDead();