SERVER-62687 Handle conflicting options for clustered collections

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/create_collection.cpp b/src/mongo/db/catalog/create_collection.cpp
index 2ce0f9b5558..e97b1f2e3a2 100644
--- a/src/mongo/db/catalog/create_collection.cpp
+++ b/src/mongo/db/catalog/create_collection.cpp
@@ -459,12 +459,18 @@ Status _createCollection(OperationContext* opCtx,
                           str::stream() << "A view already exists. NS: " << nss);
         }
 
+        if (!collectionOptions.clusteredIndex && collectionOptions.expireAfterSeconds) {
+            return Status(ErrorCodes::InvalidOptions,
+                          "'expireAfterSeconds' requires clustering to be enabled");
+        }
+
         if (!collectionOptions.clusteredIndex && (!idIndex || idIndex->isEmpty()) &&
             // Capped, clustered collections different in behavior significantly from normal capped
             // collections. Notably, they allow out-of-order insertion.
             !collectionOptions.capped && clusterAllCollectionsByDefault.shouldFail()) {
             collectionOptions.clusteredIndex = clustered_util::makeDefaultClusteredIdIndex();
         }
+
         if (auto clusteredIndex = collectionOptions.clusteredIndex) {
             bool clusteredIndexesEnabled =
                 feature_flags::gClusteredIndexes.isEnabled(serverGlobalParams.featureCompatibility);