From 0c635eacbc7a7c62df7261513601e18b60c8b210 Mon Sep 17 00:00:00 2001 From: Esha Maharishi Date: Thu, 1 Sep 2016 12:00:11 -0400 Subject: Revert "SERVER-25388 Use consistent options parsing to force journaling to be enabled with configsvr" This reverts commit 750754153357481e40c498f1def3371af79f2309. --- src/mongo/db/mongod_options.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/mongo/db/mongod_options.cpp') diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp index 98c498f0bfa..4690d6ef0df 100644 --- a/src/mongo/db/mongod_options.cpp +++ b/src/mongo/db/mongod_options.cpp @@ -1248,6 +1248,12 @@ Status storeMongodOptions(const moe::Environment& params) { if (params.count("sharding.clusterRole")) { auto clusterRoleParam = params["sharding.clusterRole"].as(); 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); @@ -1257,11 +1263,6 @@ Status storeMongodOptions(const moe::Environment& params) { storageGlobalParams.dur = true; } - if (!storageGlobalParams.dur) { - return Status(ErrorCodes::BadValue, - "journaling cannot be turned off when configsvr is specified"); - } - if (!params.count("storage.dbPath")) { storageGlobalParams.dbpath = storageGlobalParams.kDefaultConfigDbPath; } -- cgit v1.2.1