SERVER-24551 Version 3.2 incorrect 'nojournal is not allowed when configsvr is specified' error when specifying nojournal=false

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 2d2db93a737..6948fd880af 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -447,8 +447,7 @@ Status addMongodOptions(moe::OptionSection* options) {
                            "declare this is a config db of a cluster; default port 27019; "
                            "default dir /data/configdb")
         .setSources(moe::SourceAllLegacy)
-        .incompatibleWith("shardsvr")
-        .incompatibleWith("nojournal");
+        .incompatibleWith("shardsvr");
 
     sharding_options
         .addOptionChaining("shardsvr",
@@ -1256,6 +1255,12 @@ Status storeMongodOptions(const moe::Environment& params, const std::vector<std:
     if (params.count("sharding.clusterRole")) {
         auto clusterRoleParam = params["sharding.clusterRole"].as<std::string>();
         if (clusterRoleParam == "configsvr") {
+            bool journal = true;
+            params.get("storage.journal.enabled", &journal);
+            if (!journal) {
+                return Status(ErrorCodes::BadValue,
+                              "journaling cannot be turned off when configsvr is specified");
+            }
             serverGlobalParams.clusterRole = ClusterRole::ConfigServer;
             replSettings.setMajorityReadConcernEnabled(true);