summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2015-10-26 18:20:38 -0400
committerAndy Schwerin <schwerin@mongodb.com>2015-10-28 12:47:23 -0400
commit5fcf227019e365e3ddc81a4ea5db97ab0cef4c33 (patch)
treebb76ce35ab749f134feef9ae527cf2acf716fb9c /src/mongo
parente32e50bf9a168c78d3c1de947fbe074f3efdae7e (diff)
downloadmongo-5fcf227019e365e3ddc81a4ea5db97ab0cef4c33.tar.gz
SERVER-20694 Do not require w:majority on writes to config replica sets in SCCC mode.
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/write_concern.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp
index 9bb340c03bc..e5e700fa49e 100644
--- a/src/mongo/db/write_concern.cpp
+++ b/src/mongo/db/write_concern.cpp
@@ -142,7 +142,8 @@ Status validateWriteConcern(const WriteConcernOptions& writeConcern, const std::
<< "w:1 and w:'majority' are the only valid write concerns when writing to "
"config servers, got: " << writeConcern.toBSON().toString());
}
- if (replMode == repl::ReplicationCoordinator::modeReplSet && !isLocalDb &&
+ if (serverGlobalParams.configsvrMode == CatalogManager::ConfigServerMode::CSRS &&
+ replMode == repl::ReplicationCoordinator::modeReplSet && !isLocalDb &&
writeConcern.wMode.empty()) {
invariant(writeConcern.wNumNodes == 1);
return Status(