SERVER-25323 Allow marking ServerParameters as 'test only'

1 files changed, 4 insertions, 1 deletions

diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp
index 176a3c3eb08..ae17cce3da2 100644
--- a/src/mongo/db/server_options_helpers.cpp
+++ b/src/mongo/db/server_options_helpers.cpp
@@ -291,11 +291,14 @@ Status validateBaseOptions(const moe::Environment& params) {
         std::map<std::string, std::string> parameters =
             params["setParameter"].as<std::map<std::string, std::string>>();
 
-        // Only register failpoint server parameters if enableTestCommands=1.
         auto enableTestCommandsParameter = parameters.find("enableTestCommands");
         if (enableTestCommandsParameter != parameters.end() &&
             enableTestCommandsParameter->second.compare("1") == 0) {
+            // Only register failpoint server parameters if enableTestCommands=1.
             getGlobalFailPointRegistry()->registerAllFailPointsAsServerParameters();
+        } else {
+            // Deregister test-only parameters.
+            ServerParameterSet::getGlobal()->disableTestParameters();
         }
     }