SERVER-63732 Add new implicitlyCreateIndex and enforceUniqueness to shardCollection command

1 files changed, 21 insertions, 7 deletions

diff --git a/src/mongo/db/s/create_collection_coordinator.cpp b/src/mongo/db/s/create_collection_coordinator.cpp
index 76122d24165..eaf25a98659 100644
--- a/src/mongo/db/s/create_collection_coordinator.cpp
+++ b/src/mongo/db/s/create_collection_coordinator.cpp
@@ -759,13 +759,27 @@ void CreateCollectionCoordinator::_createCollectionAndIndexes(OperationContext*
 
     shardkeyutil::validateShardKeyIsNotEncrypted(opCtx, nss(), *_shardKeyPattern);
 
-    const auto indexCreated = shardkeyutil::validateShardKeyIndexExistsOrCreateIfPossible(
-        opCtx,
-        nss(),
-        *_shardKeyPattern,
-        _collationBSON,
-        _doc.getUnique().value_or(false),
-        shardkeyutil::ValidationBehaviorsShardCollection(opCtx));
+    auto indexCreated = false;
+    if (_doc.getImplicitlyCreateIndex()) {
+        indexCreated = shardkeyutil::validateShardKeyIndexExistsOrCreateIfPossible(
+            opCtx,
+            nss(),
+            *_shardKeyPattern,
+            _collationBSON,
+            _doc.getUnique().value_or(false),
+            _doc.getEnforceUniquenessCheck(),
+            shardkeyutil::ValidationBehaviorsShardCollection(opCtx));
+    } else {
+        uassert(6373200,
+                "Must have an index compatible with the proposed shard key",
+                validShardKeyIndexExists(opCtx,
+                                         nss(),
+                                         *_shardKeyPattern,
+                                         _collationBSON,
+                                         _doc.getUnique().value_or(false) &&
+                                             _doc.getEnforceUniquenessCheck(),
+                                         shardkeyutil::ValidationBehaviorsShardCollection(opCtx)));
+    }
 
     auto replClientInfo = repl::ReplClientInfo::forClient(opCtx->getClient());