diff options
| -rw-r--r-- | jstests/noPassthroughWithMongod/ftdc_params.js | 24 | ||||
| -rw-r--r-- | src/mongo/db/ftdc/ftdc_mongod.cpp | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/jstests/noPassthroughWithMongod/ftdc_params.js b/jstests/noPassthroughWithMongod/ftdc_params.js index f1f5f7c35df..9a0fe20d965 100644 --- a/jstests/noPassthroughWithMongod/ftdc_params.js +++ b/jstests/noPassthroughWithMongod/ftdc_params.js @@ -17,8 +17,8 @@ // Verify the defaults are as we documented them assert.eq(getparam("diagnosticDataCollectionEnabled"), true); assert.eq(getparam("diagnosticDataCollectionPeriodMillis"), 1000); - assert.eq(getparam("diagnosticDataCollectionDirectorySizeMb"), 100); - assert.eq(getparam("diagnosticDataCollectionFileSizeMb"), 10); + assert.eq(getparam("diagnosticDataCollectionDirectorySizeMB"), 100); + assert.eq(getparam("diagnosticDataCollectionFileSizeMB"), 10); assert.eq(getparam("diagnosticDataCollectionSamplesPerChunk"), 300); assert.eq(getparam("diagnosticDataCollectionSamplesPerInterimUpdate"), 10); @@ -29,29 +29,29 @@ assert.commandWorked(setparam({"diagnosticDataCollectionEnabled": 1})); assert.commandWorked(setparam({"diagnosticDataCollectionPeriodMillis": 100})); - assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMb": 10})); - assert.commandWorked(setparam({"diagnosticDataCollectionFileSizeMb": 1})); + assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMB": 10})); + assert.commandWorked(setparam({"diagnosticDataCollectionFileSizeMB": 1})); assert.commandWorked(setparam({"diagnosticDataCollectionSamplesPerChunk": 2})); assert.commandWorked(setparam({"diagnosticDataCollectionSamplesPerInterimUpdate": 2})); // Negative tests - set values below minimums assert.commandFailed(setparam({"diagnosticDataCollectionPeriodMillis": 1})); - assert.commandFailed(setparam({"diagnosticDataCollectionDirectorySizeMb": 1})); + assert.commandFailed(setparam({"diagnosticDataCollectionDirectorySizeMB": 1})); assert.commandFailed(setparam({"diagnosticDataCollectionSamplesPerChunk": 1})); assert.commandFailed(setparam({"diagnosticDataCollectionSamplesPerInterimUpdate": 1})); // Negative test - set file size bigger then directory size - assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMb": 10})); - assert.commandFailed(setparam({"diagnosticDataCollectionFileSizeMb": 100})); + assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMB": 10})); + assert.commandFailed(setparam({"diagnosticDataCollectionFileSizeMB": 100})); // Negative test - set directory size less then file size - assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMb": 100})); - assert.commandWorked(setparam({"diagnosticDataCollectionFileSizeMb": 50})); - assert.commandFailed(setparam({"diagnosticDataCollectionDirectorySizeMb": 10})); + assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMB": 100})); + assert.commandWorked(setparam({"diagnosticDataCollectionFileSizeMB": 50})); + assert.commandFailed(setparam({"diagnosticDataCollectionDirectorySizeMB": 10})); // Reset - assert.commandWorked(setparam({"diagnosticDataCollectionFileSizeMb": 10})); - assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMb": 100})); + assert.commandWorked(setparam({"diagnosticDataCollectionFileSizeMB": 10})); + assert.commandWorked(setparam({"diagnosticDataCollectionDirectorySizeMB": 100})); assert.commandWorked(setparam({"diagnosticDataCollectionPeriodMillis": 1000})); assert.commandWorked(setparam({"diagnosticDataCollectionSamplesPerChunk": 300})); assert.commandWorked(setparam({"diagnosticDataCollectionSamplesPerInterimUpdate": 10})); diff --git a/src/mongo/db/ftdc/ftdc_mongod.cpp b/src/mongo/db/ftdc/ftdc_mongod.cpp index 8e725f862df..dc7bf12f999 100644 --- a/src/mongo/db/ftdc/ftdc_mongod.cpp +++ b/src/mongo/db/ftdc/ftdc_mongod.cpp @@ -123,23 +123,23 @@ public: ExportedFTDCDirectorySizeParameter() : ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime>( ServerParameterSet::getGlobal(), - "diagnosticDataCollectionDirectorySizeMb", + "diagnosticDataCollectionDirectorySizeMB", &localMaxDirectorySizeMB) {} virtual Status validate(const std::int32_t& potentialNewValue) { if (potentialNewValue < 10) { return Status( ErrorCodes::BadValue, - "diagnosticDataCollectionDirectorySizeMb must be greater than or equal to 10"); + "diagnosticDataCollectionDirectorySizeMB must be greater than or equal to 10"); } if (potentialNewValue < localMaxFileSizeMB) { return Status( ErrorCodes::BadValue, str::stream() - << "diagnosticDataCollectionDirectorySizeMb must be greater than or equal to '" + << "diagnosticDataCollectionDirectorySizeMB must be greater than or equal to '" << localMaxFileSizeMB - << "' which is the current value of diagnosticDataCollectionFileSizeMb."); + << "' which is the current value of diagnosticDataCollectionFileSizeMB."); } auto controller = getGlobalFTDCController(); @@ -158,22 +158,22 @@ public: ExportedFTDCFileSizeParameter() : ExportedServerParameter<std::int32_t, ServerParameterType::kStartupAndRuntime>( ServerParameterSet::getGlobal(), - "diagnosticDataCollectionFileSizeMb", + "diagnosticDataCollectionFileSizeMB", &localMaxFileSizeMB) {} virtual Status validate(const std::int32_t& potentialNewValue) { if (potentialNewValue < 1) { return Status(ErrorCodes::BadValue, - "diagnosticDataCollectionFileSizeMb must be greater than or equal to 1"); + "diagnosticDataCollectionFileSizeMB must be greater than or equal to 1"); } if (potentialNewValue > localMaxDirectorySizeMB) { return Status( ErrorCodes::BadValue, str::stream() - << "diagnosticDataCollectionFileSizeMb must be less than or equal to '" + << "diagnosticDataCollectionFileSizeMB must be less than or equal to '" << localMaxDirectorySizeMB - << "' which is the current value of diagnosticDataCollectionDirectorySizeMb."); + << "' which is the current value of diagnosticDataCollectionDirectorySizeMB."); } auto controller = getGlobalFTDCController(); |