diff options
| -rw-r--r-- | src/mongo/db/SConscript | 3 | ||||
| -rw-r--r-- | src/mongo/db/snapshot_window_options.cpp | 127 | ||||
| -rw-r--r-- | src/mongo/db/snapshot_window_options.idl | 83 |
3 files changed, 85 insertions, 128 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 1d9080f2517..0c05d25bf65 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -1593,9 +1593,10 @@ env.Library( target='snapshot_window_options', source=[ 'snapshot_window_options.cpp', + env.Idlc('snapshot_window_options.idl')[0], ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/server_parameters', + '$BUILD_DIR/mongo/idl/server_parameter', ], ) diff --git a/src/mongo/db/snapshot_window_options.cpp b/src/mongo/db/snapshot_window_options.cpp index b96955433a3..e8da99c254b 100644 --- a/src/mongo/db/snapshot_window_options.cpp +++ b/src/mongo/db/snapshot_window_options.cpp @@ -41,133 +41,6 @@ namespace mongo { SnapshotWindowParams snapshotWindowParams; /** - * Provides validation for snapshot window server parameter settings. - */ - -MONGO_COMPILER_VARIABLE_UNUSED auto _exportedMaxTargetSnapshotHistoryWindowInSeconds = - (new ExportedServerParameter<int32_t, ServerParameterType::kStartupAndRuntime>( - ServerParameterSet::getGlobal(), - "maxTargetSnapshotHistoryWindowInSeconds", - &snapshotWindowParams.maxTargetSnapshotHistoryWindowInSeconds)) - -> withValidator([](const int32_t& potentialNewValue) { - if (potentialNewValue < 0) { - return Status(ErrorCodes::BadValue, - str::stream() << "maxTargetSnapshotHistoryWindowInSeconds must be " - "greater than or equal to 0. '" - << potentialNewValue - << "' is an invalid setting."); - } - return Status::OK(); - }); - -MONGO_COMPILER_VARIABLE_UNUSED auto _exportedCachePressureThreshold = - (new ExportedServerParameter<int32_t, ServerParameterType::kStartupAndRuntime>( - ServerParameterSet::getGlobal(), - "cachePressureThreshold", - &snapshotWindowParams.cachePressureThreshold)) - -> withValidator([](const int32_t& potentialNewValue) { - if (potentialNewValue < 0 || potentialNewValue > 100) { - return Status(ErrorCodes::BadValue, - str::stream() << "cachePressureThreshold must be greater than or " - "equal to 0 and less than or equal to 100. '" - << potentialNewValue - << "' is an invalid setting."); - } - return Status::OK(); - }); - -MONGO_COMPILER_VARIABLE_UNUSED auto _exportedSnapshotWindowMultiplicativeDecrease = - (new ExportedServerParameter<double, ServerParameterType::kStartupAndRuntime>( - ServerParameterSet::getGlobal(), - "snapshotWindowMultiplicativeDecrease", - &snapshotWindowParams.snapshotWindowMultiplicativeDecrease)) - -> withValidator([](const double& potentialNewValue) { - if (potentialNewValue <= 0 || potentialNewValue >= 1) { - return Status(ErrorCodes::BadValue, - str::stream() - << "snapshotWindowMultiplicativeDecrease must be greater " - "than 0 and less than 1. '" - << potentialNewValue - << "' is an invalid setting."); - } - - return Status::OK(); - }); - -MONGO_COMPILER_VARIABLE_UNUSED auto _exportedSnapshotWindowAdditiveIncreaseSeconds = - (new ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime>( - ServerParameterSet::getGlobal(), - "snapshotWindowAdditiveIncreaseSeconds", - &snapshotWindowParams - .snapshotWindowAdditiveIncreaseSeconds)) -> withValidator([](const int32_t& - potentialNewValue) { - if (potentialNewValue < 1) { - return Status( - ErrorCodes::BadValue, - str::stream() - << "snapshotWindowAdditiveIncreaseSeconds must be greater than or equal to 1. '" - << potentialNewValue - << "' is an invalid setting."); - } - - return Status::OK(); - }); - -MONGO_COMPILER_VARIABLE_UNUSED auto _exportedMinMillisBetweenSnapshotWindowInc = - (new ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime>( - ServerParameterSet::getGlobal(), - "minMillisBetweenSnapshotWindowInc", - &snapshotWindowParams.minMillisBetweenSnapshotWindowInc)) - -> withValidator([](const int32_t& potentialNewValue) { - if (potentialNewValue < 1) { - return Status( - ErrorCodes::BadValue, - str::stream() - << "minMillisBetweenSnapshotWindowInc must be greater than or equal to 1. '" - << potentialNewValue - << "' is an invalid setting."); - } - - return Status::OK(); - }); - -MONGO_COMPILER_VARIABLE_UNUSED auto _exportedMinMillisBetweenSnapshotWindowDec = - (new ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime>( - ServerParameterSet::getGlobal(), - "minMillisBetweenSnapshotWindowDec", - &snapshotWindowParams.minMillisBetweenSnapshotWindowDec)) - -> withValidator([](const int32_t& potentialNewValue) { - if (potentialNewValue < 1) { - return Status( - ErrorCodes::BadValue, - str::stream() - << "minMillisBetweenSnapshotWindowDec must be greater than or equal to 1. '" - << potentialNewValue - << "' is an invalid setting."); - } - - return Status::OK(); - }); - -MONGO_COMPILER_VARIABLE_UNUSED auto _exportedCheckCachePressurePeriodSeconds = - (new ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime>( - ServerParameterSet::getGlobal(), - "checkCachePressurePeriodSeconds", - &snapshotWindowParams.checkCachePressurePeriodSeconds)) - -> withValidator([](const int32_t& potentialNewValue) { - if (potentialNewValue < 1) { - return Status( - ErrorCodes::BadValue, - str::stream() - << "checkCachePressurePeriodSeconds must be greater than or equal to 1. '" - << potentialNewValue - << "' is an invalid setting."); - } - - return Status::OK(); - }); - -/** * After startup parameters have been initialized, set targetSnapshotHistoryWindowInSeconds to the * value of maxTargetSnapshotHistoryWindowInSeconds, in case the max has been altered. The cache * pressure is zero to begin with, so the user should not have to wait for the target to slowly diff --git a/src/mongo/db/snapshot_window_options.idl b/src/mongo/db/snapshot_window_options.idl new file mode 100644 index 00000000000..277d5b665ee --- /dev/null +++ b/src/mongo/db/snapshot_window_options.idl @@ -0,0 +1,83 @@ +# Copyright (C) 2018-present MongoDB, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the Server Side Public License, version 1, +# as published by MongoDB, Inc. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# Server Side Public License for more details. +# +# You should have received a copy of the Server Side Public License +# along with this program. If not, see +# <http://www.mongodb.com/licensing/server-side-public-license>. +# +# As a special exception, the copyright holders give permission to link the +# code of portions of this program with the OpenSSL library under certain +# conditions as described in each individual source file and distribute +# linked combinations including the program with the OpenSSL library. You +# must comply with the Server Side Public License in all respects for +# all of the code used other than as permitted herein. If you modify file(s) +# with this exception, you may extend this exception to your version of the +# file(s), but you are not obligated to do so. If you do not wish to do so, +# delete this exception statement from your version. If you delete this +# exception statement from all source files in the program, then also delete +# it in the license file. +# + +global: + cpp_namespace: "mongo" + cpp_includes: + - "mongo/db/snapshot_window_options.h" + +imports: + - "mongo/idl/basic_types.idl" + +server_parameters: + maxTargetSnapshotHistoryWindowInSeconds: + description: "Maximum target snapshot history window, in seconds" + set_at: [ startup, runtime ] + cpp_varname: "snapshotWindowParams.maxTargetSnapshotHistoryWindowInSeconds" + validator: { gte: 0 } + + cachePressureThreshold: + description: "Cache pressure threshold" + set_at: [ startup, runtime ] + cpp_varname: "snapshotWindowParams.cachePressureThreshold" + validator: + gte: 0 + lte: 100 + + snapshotWindowMultiplicativeDecrease: + description: "Snapshot window multiplicative decrease" + set_at: [ startup, runtime ] + cpp_varname: "snapshotWindowParams.snapshotWindowMultiplicativeDecrease" + validator: + gt: 0.0 + lt: 1.0 + + snapshotWindowAdditiveIncreaseSeconds: + description: "Snapshot window multiplicative increase, in seconds" + set_at: [ startup, runtime ] + cpp_varname: "snapshotWindowParams.snapshotWindowAdditiveIncreaseSeconds" + validator: { gte: 1 } + + minMillisBetweenSnapshotWindowInc: + description: "Minimum duration between snapshot window increment, in milliseconds" + set_at: [ startup, runtime ] + cpp_varname: "snapshotWindowParams.minMillisBetweenSnapshotWindowInc" + validator: { gte: 1 } + + minMillisBetweenSnapshotWindowDec: + description: "Minimum duration between snapshot window decrement, in milliseconds" + set_at: [ startup, runtime ] + cpp_varname: "snapshotWindowParams.minMillisBetweenSnapshotWindowDec" + validator: { gte: 1 } + + checkCachePressurePeriodSeconds: + description: "Check cache pressure period, in seconds" + set_at: [ startup, runtime ] + cpp_varname: "snapshotWindowParams.checkCachePressurePeriodSeconds" + validator: { gte: 1 } + |