Revert "SERVER-46291 make --wiredTigerMaxCacheOverflowFileSizeGB a noop"

This reverts commit 6a836f75daa0d40892f63e4186ac9e2f582bba23.

5 files changed, 8 insertions, 24 deletions

diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h
index b2f66596748..677f4dce055 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.h
@@ -43,7 +43,6 @@ public:
           checkpointDelaySecs(0),
           statisticsLogDelaySecs(0),
           directoryForIndexes(false),
-          maxCacheOverflowFileSizeGBDeprecated(0),
           maxHistoryFileSizeGB(0),
           useCollectionPrefixCompression(false),
           useIndexPrefixCompression(false){};
@@ -55,7 +54,6 @@ public:
     size_t statisticsLogDelaySecs;
     std::string journalCompressor;
     bool directoryForIndexes;
-    double maxCacheOverflowFileSizeGBDeprecated;
     double maxHistoryFileSizeGB;
     std::string engineConfig;
 
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.idl b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.idl
index c41cce07192..7f2a756fdab 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.idl
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_global_options.idl
@@ -71,23 +71,15 @@ configs:
         arg_vartype: Switch
         cpp_varname: 'wiredTigerGlobalOptions.directoryForIndexes'
         short_name: wiredTigerDirectoryForIndexes
-    "storage.wiredTiger.engineConfig.maxCacheOverflowFileSizeGB":
-        description: >-
-            Maximum amount of disk space to use for cache overflow;
-            Defaults to 0 (unbounded)
-            Deprecated. Has no effect on storage engine operation.
-        arg_vartype: Double
-        cpp_varname: 'wiredTigerGlobalOptions.maxCacheOverflowFileSizeGBDeprecated'
-        short_name: wiredTigerMaxCacheOverflowFileSizeGB
-        default: 0.0
-        hidden: true
     "storage.wiredTiger.engineConfig.maxHistoryFileSizeGB":
+        deprecated_name: 'storage.wiredTiger.engineConfig.maxCacheOverflowFileSizeGB'
         description: >-
             Maximum amount of disk space to use for history file;
             Defaults to 0 (unbounded)
         arg_vartype: Double
         cpp_varname: 'wiredTigerGlobalOptions.maxHistoryFileSizeGB'
         short_name: wiredTigerMaxHistoryFileSizeGB
+        deprecated_short_name: wiredTigerMaxCacheOverflowFileSizeGB
         validator:
             callback: 'WiredTigerGlobalOptions::validateMaxHistoryFileSizeGB'
         default: 0.0
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index bf7cf88018a..2e9fba15b27 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -788,6 +788,8 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName,
     _maxHistoryFileSizeGBParam.reset(new WiredTigerMaxHistoryFileSizeGBParameter(
         "wiredTigerMaxHistoryFileSizeGB", ServerParameterType::kRuntimeOnly));
     _maxHistoryFileSizeGBParam->_data = {maxHistoryFileSizeMB / 1024, this};
+    _maxCacheOverflowParam.reset(new IDLServerParameterDeprecatedAlias(
+        "wiredTigerMaxCacheOverflowSizeGB", _maxHistoryFileSizeGBParam.get()));
 }
 
 WiredTigerKVEngine::~WiredTigerKVEngine() {
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
index 5aa82a54fdd..d118037fd0e 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
@@ -466,6 +466,7 @@ private:
 
     std::unique_ptr<WiredTigerEngineRuntimeConfigParameter> _runTimeConfigParam;
     std::unique_ptr<WiredTigerMaxHistoryFileSizeGBParameter> _maxHistoryFileSizeGBParam;
+    std::unique_ptr<ServerParameter> _maxCacheOverflowParam;
 
     mutable Mutex _highestDurableTimestampMutex =
         MONGO_MAKE_LATCH("WiredTigerKVEngine::_highestDurableTimestampMutex");
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_parameters.idl b/src/mongo/db/storage/wiredtiger/wiredtiger_parameters.idl
index 24dd8c1a69f..bb6fb5dfc8b 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_parameters.idl
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_parameters.idl
@@ -104,17 +104,8 @@ server_parameters:
         cpp_varname: gWiredTigerCursorCacheSize
         default: -100
 
-    wiredTigerMaxCacheOverflowSizeGB:
-      description: >-
-        Maximum amount of disk space to use for cache overflow;
-        Defaults to 0 (unbounded)
-        Deprecated.
-      set_at: runtime
-      cpp_vartype: 'AtomicWord<double>'
-      cpp_varname: gWiredTigerMaxCacheOverflowSizeGBDeprecated
-      default: 0
-
     wiredTigerMaxHistorySizeGB:
+      deprecated_name: wiredTigerMaxCacheOverflowSizeGB
       description: >-
         Maximum amount of disk space to use for history file;
         Defaults to 0 (unbounded)
@@ -123,8 +114,8 @@ server_parameters:
         name: WiredTigerMaxHistoryFileSizeGBParameter
         data: 'std::pair<double, WiredTigerKVEngine*>'
         override_set: true
-      # This parameter has to be initialized in the WiredTigerKVEngine constructor due to the
-      # WiredTigerKVEngine dependency.
+      # This parameter, along with the deprecation alias, has to be initialized in
+      # the WiredTigerKVEngine constructor due to the WiredTigerKVEngine dependency.
       condition: { expr: false }
 
     wiredTigerEvictionDebugMode: