SERVER-32198 Get rid of CollectionShardingState::collectionIsSharded

(cherry picked from commit 80de0da37b00dbeed576b28a842cb172b6714358)

SERVER-35773 Remove references to the CatalogCache from MetadataManager

(cherry picked from commit 2aa65a86193e5d38934a4f2d6b0a8298e2432485)

SERVER-32198 Add support for an optional `vWanted` to StaleConfigInfo

(cherry picked from commit 60559a00b81293184922b3418a8e56610edf8dd9)

SERVER-36054 Remove ScopedCollectionMetadata's operator bool

(cherry picked from commit c9c340ad6e9e1f33cb001a8375c62d6b16138c74)

SERVER-36054 Remove more unused methods from CSS/MetadataManager

(cherry picked from commit ca04f5bcf9bfa73c9162b3a77225c997c6deec8a)

SERVER-36116 Get rid of CollectionShardingState::resetAll

(cherry picked from commit db1cc80d13d203b6351f5510f7756cc1c7bfc0ea)

SERVER-36054 Get rid of unused methods from CollectionShardingState

(cherry picked from commit 884d232473dca72e0872f0e540d4c3108c1e0b3d)

SERVER-36164 Decouple ScopedCollectionMetadata from MetadataManager

(cherry picked from commit d91262c4a2ed7d94923c3b1c5ff5d208aa981c73)

SERVER-29908 Move CollectionShardingState under sharding_api_d

(cherry picked from commit e491e284e8066929c8272c96a3128241ab481be8)

SERVER-29908 Remove ShardingState::appendInfo

Expose the ShardingState properties and move the appendInfo logic to be
entirely inside the 'getShardingState' function, which is its only
consumer.

(cherry picked from commit 24e411d5cd7f64c5b4da25a351529cd1873284b8)

SERVER-29908 Move 'updateConfigServerOpTimeFromMetadata' out of ShardingState

(cherry picked from commit 7a97557ce5bf74dc2b663762b7a5ffb9c958d580)

SERVER-29908 Move all runtime logic out of ShardingState

... and move it into a ShardingInitializationMongoD class, which is
responsible for driving the sharding-awareness of the node and setting
it onto ShardingState.

Also gets rid of the 'sharding' library, so there is no more library
dependency cycle.

(cherry picked from commit 200c3dc58410d8b3287a2075cc9b2ad085100e83)

SERVER-29908 Fold the 'sharding_connection_hook' library into 'sharding_initialization'

... and also remove dependency of MongoS on the replication coordinator

(cherry picked from commit fab6864f4edcae7bb304f79e601f1f62cc376a77)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp
index e71d703b488..afceb6c9d98 100644
--- a/src/mongo/db/commands/create_indexes.cpp
+++ b/src/mongo/db/commands/create_indexes.cpp
@@ -406,8 +406,8 @@ private:
                                               const BSONObj& newIdxKey) {
         invariant(opCtx->lockState()->isCollectionLockedForMode(nss.ns(), MODE_X));
 
-        auto metadata(CollectionShardingState::get(opCtx, nss)->getMetadata(opCtx));
-        if (metadata) {
+        auto metadata = CollectionShardingState::get(opCtx, nss)->getMetadata(opCtx);
+        if (metadata->isSharded()) {
             ShardKeyPattern shardKeyPattern(metadata->getKeyPattern());
             if (!shardKeyPattern.isUniqueIndexCompatible(newIdxKey)) {
                 return Status(ErrorCodes::CannotCreateIndex,