summaryrefslogtreecommitdiff
path: root/src/mongo/s/mongos_options.cpp
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2015-10-16 11:27:06 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2015-10-19 17:05:30 -0400
commit02c1f2916cfd174de5341c50045811df116a0576 (patch)
tree40170a3ba3fc5197259e9dd3e332080a470746cf /src/mongo/s/mongos_options.cpp
parentc6c178f2e561db9db30b1768cbe119654dd86708 (diff)
downloadmongo-02c1f2916cfd174de5341c50045811df116a0576.tar.gz
SERVER-20970 Allow a single-node SCCC config server
Enables the configuration in mongos and also writes a smoke test to ensure that the basic sharding operations work.
Diffstat (limited to 'src/mongo/s/mongos_options.cpp')
-rw-r--r--src/mongo/s/mongos_options.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mongo/s/mongos_options.cpp b/src/mongo/s/mongos_options.cpp
index 740420509cc..4139c8d56f6 100644
--- a/src/mongo/s/mongos_options.cpp
+++ b/src/mongo/s/mongos_options.cpp
@@ -264,15 +264,16 @@ Status storeMongosOptions(const moe::Environment& params, const std::vector<std:
std::vector<HostAndPort> configServers = mongosGlobalParams.configdbs.getServers();
if (mongosGlobalParams.configdbs.type() != ConnectionString::SYNC &&
- mongosGlobalParams.configdbs.type() != ConnectionString::SET) {
- return Status(
- ErrorCodes::BadValue,
- "Must have either 3 node legacy config servers, or a replica set config server");
+ mongosGlobalParams.configdbs.type() != ConnectionString::SET &&
+ mongosGlobalParams.configdbs.type() != ConnectionString::MASTER) {
+ return Status(ErrorCodes::BadValue,
+ str::stream() << "Invalid config server value "
+ << mongosGlobalParams.configdbs.toString());
}
if (configServers.size() < 3) {
- warning() << "running with less than 3 config servers should be done only for testing "
- "purposes and is not recommended for production";
+ warning() << "Running a sharded cluster with fewer than 3 config servers should only be "
+ "done for testing purposes and is not recommended for production.";
}
return Status::OK();