SERVER-13006 getParameter for journalCommitInterval returns the appropriate value

4 files changed, 1 insertions, 9 deletions

diff --git a/src/mongo/db/storage/storage_parameters.idl b/src/mongo/db/storage/storage_parameters.idl
index 39555967ba8..f5e40e65785 100644
--- a/src/mongo/db/storage/storage_parameters.idl
+++ b/src/mongo/db/storage/storage_parameters.idl
@@ -53,6 +53,7 @@ server_parameters:
         description: 'Number of milliseconds between journal commits'
         set_at: runtime
         cpp_varname: 'storageGlobalParams.journalCommitIntervalMs'
+        default: 100
         validator:
             gte: 1
             lte: { expr: 'StorageGlobalParams::kMaxJournalCommitIntervalMs' }
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index f6d89fc21ae..275687829b3 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -167,8 +167,6 @@ using std::string;
 
 namespace dps = ::mongo::dotted_path_support;
 
-const int WiredTigerKVEngine::kDefaultJournalDelayMillis = 100;
-
 class WiredTigerKVEngine::WiredTigerSessionSweeper : public BackgroundJob {
 public:
     explicit WiredTigerSessionSweeper(WiredTigerSessionCache* sessionCache)
@@ -240,9 +238,6 @@ public:
             }
 
             int ms = storageGlobalParams.journalCommitIntervalMs.load();
-            if (!ms) {
-                ms = kDefaultJournalDelayMillis;
-            }
 
             MONGO_IDLE_THREAD_BLOCK;
             sleepmillis(ms);
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
index 1f07e81debc..c7f6efd48cc 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
@@ -65,7 +65,6 @@ struct WiredTigerFileVersion {
 
 class WiredTigerKVEngine final : public KVEngine {
 public:
-    static const int kDefaultJournalDelayMillis;
     static StringData kTableUriPrefix;
 
     WiredTigerKVEngine(const std::string& canonicalName,
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp
index 98df9ac9c3d..ff45337699d 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp
@@ -171,9 +171,6 @@ void WiredTigerOplogManager::_oplogJournalThreadLoop(WiredTigerSessionCache* ses
             // If we're not shutting down and nobody is actively waiting for the oplog to become
             // durable, delay journaling a bit to reduce the sync rate.
             auto journalDelay = Milliseconds(storageGlobalParams.journalCommitIntervalMs.load());
-            if (journalDelay == Milliseconds(0)) {
-                journalDelay = Milliseconds(WiredTigerKVEngine::kDefaultJournalDelayMillis);
-            }
             auto now = Date_t::now();
             auto deadline = now + journalDelay;
             auto shouldSyncOpsWaitingForJournal = [&] {