summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/collection_options.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/catalog/collection_options.cpp')
-rw-r--r--src/mongo/db/catalog/collection_options.cpp4
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