From 3665b6c94eca099458b212875560655d2b5371c9 Mon Sep 17 00:00:00 2001 From: Tess Avitabile Date: Tue, 4 Oct 2016 13:19:20 -0400 Subject: SERVER-26450 Whitelist maxTimeMS option to create command --- src/mongo/db/catalog/collection_options.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/mongo/db') 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 -- cgit v1.2.1