diff options
| -rw-r--r-- | jstests/core/create_collection.js | 2 | ||||
| -rw-r--r-- | src/mongo/s/commands/cluster_create_cmd.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/jstests/core/create_collection.js b/jstests/core/create_collection.js index 2ebbd4c0335..1d7f35236bd 100644 --- a/jstests/core/create_collection.js +++ b/jstests/core/create_collection.js @@ -134,4 +134,6 @@ indexSpec = GetIndexHelpers.findByName(db.create_collection.getIndexes(), "_id_"); assert.neq(indexSpec, null); assert.eq(indexSpec.collation.locale, "en_US", tojson(indexSpec)); + + assert.commandFailed(db.createCollection('capped_no_size', {capped: true})); })(); diff --git a/src/mongo/s/commands/cluster_create_cmd.cpp b/src/mongo/s/commands/cluster_create_cmd.cpp index 37ad3d8c0fc..bf8df8a8e54 100644 --- a/src/mongo/s/commands/cluster_create_cmd.cpp +++ b/src/mongo/s/commands/cluster_create_cmd.cpp @@ -74,6 +74,11 @@ public: uassertStatusOK(createShardDatabase(opCtx, dbName)); + uassert(ErrorCodes::InvalidOptions, + "specify size:<n> when capped is true", + !cmdObj["capped"].trueValue() || cmdObj["size"].isNumber() || + cmdObj.hasField("$nExtents")); + ConfigsvrCreateCollection configCreateCmd; configCreateCmd.setNs(nss); |