diff options
| author | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-10-04 13:19:20 -0400 |
|---|---|---|
| committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-10-04 17:07:10 -0400 |
| commit | 3665b6c94eca099458b212875560655d2b5371c9 (patch) | |
| tree | 1d888cf355463764096cfd7443075ddf08e35e40 /src/mongo/db/catalog/collection_options.cpp | |
| parent | 7e40ab701a38fcca2711e1f9ffb6b7ce403a351b (diff) | |
| download | mongo-3665b6c94eca099458b212875560655d2b5371c9.tar.gz | |
SERVER-26450 Whitelist maxTimeMS option to create command
Diffstat (limited to 'src/mongo/db/catalog/collection_options.cpp')
| -rw-r--r-- | src/mongo/db/catalog/collection_options.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mongo/db/catalog/collection_options.cpp b/src/mongo/db/catalog/collection_options.cpp index 888b5d9891d..43c3e95886d 100644 --- a/src/mongo/db/catalog/collection_options.cpp +++ b/src/mongo/db/catalog/collection_options.cpp @@ -247,6 +247,10 @@ Status CollectionOptions::parse(const BSONObj& options) { pipeline = e.Obj().getOwned(); } else if (fieldName == "writeConcern") { continue; + } else if (fieldName == "maxTimeMS") { + // TODO SERVER-26457: Remove in 3.6. This is needed in 3.4 because a 3.2 mongos can + // attach maxTimeMS to a create command on the config servers. + continue; } else { return Status(ErrorCodes::InvalidOptions, str::stream() << "The field '" << fieldName |