diff options
| author | Sam Rossi <sam.rossi@mongodb.com> | 2016-09-08 17:21:51 -0400 |
|---|---|---|
| committer | Sam Rossi <sam.rossi@mongodb.com> | 2016-09-16 15:17:14 -0400 |
| commit | b70e81ae8af3775c584159ee4800d8382f7f7feb (patch) | |
| tree | 38e2b3d8afe48b20979a36db296004d3a5f2757f /src/mongo/db/mongod_options.cpp | |
| parent | f0d958c747cfc42dd831eb2f088e963475c0ed54 (diff) | |
| download | mongo-b70e81ae8af3775c584159ee4800d8382f7f7feb.tar.gz | |
SERVER-23941 fix check for incompatible arguments when using queryableBackupMode
Diffstat (limited to 'src/mongo/db/mongod_options.cpp')
| -rw-r--r-- | src/mongo/db/mongod_options.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp index 5201f7760ea..9a3f4f3b4fe 100644 --- a/src/mongo/db/mongod_options.cpp +++ b/src/mongo/db/mongod_options.cpp @@ -664,8 +664,8 @@ Status validateMongodOptions(const moe::Environment& params) { if (params.count("storage.queryableBackupMode")) { // Command line options that are disallowed when --queryableBackupMode is specified. - for (const auto& disallowedOption : {"replSet", - "configSvr", + for (const auto& disallowedOption : {"replication.replSet", + "configsvr", "upgrade", "repair", "profile", @@ -674,14 +674,11 @@ Status validateMongodOptions(const moe::Environment& params) { "source", "only", "slavedelay", - "journal", - "storage.journal.enabled", - "dur", "autoresync", "fastsync"}) { if (params.count(disallowedOption)) { return Status(ErrorCodes::BadValue, - str::stream() << "Cannot specify both --queryableBackupMode and --" + str::stream() << "Cannot specify both queryable backup mode and " << disallowedOption); } } |