diff options
| author | Jack Mulrow <jack.mulrow@mongodb.com> | 2023-03-28 20:28:21 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-03-29 01:47:34 +0000 |
| commit | 40e62357f5f3095adb33d00419cbd6194b8ae99c (patch) | |
| tree | 0e0846d09ecdccef87cd69220cdebeb0a06a5b2a /src/mongo/db/s | |
| parent | c9615e6c12f0f478f423c6b6b9f6177db1c56363 (diff) | |
| download | mongo-40e62357f5f3095adb33d00419cbd6194b8ae99c.tar.gz | |
SERVER-75385 Clean up code from earlier catalog shard design
Diffstat (limited to 'src/mongo/db/s')
| -rw-r--r-- | src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp index 560d8e237f7..f27ac525b62 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_shard_operations.cpp @@ -432,19 +432,10 @@ StatusWith<ShardType> ShardingCatalogManager::_validateHostAsShard( } // Is it a config server? - if (resIsMaster.hasField("configsvr")) { - if (!isCatalogShard) { - return {ErrorCodes::OperationFailed, - str::stream() << "Cannot add " << connectionString.toString() - << " as a shard since it is a config server"}; - } - - auto ourSetName = repl::ReplicationCoordinator::get(opCtx)->getSettings().ourSetName(); - if (providedSetName != ourSetName) { - return {ErrorCodes::OperationFailed, - str::stream() << "Cannot add " << connectionString.toString() - << " as a catalog shard since it is a different config server"}; - } + if (resIsMaster.hasField("configsvr") && !isCatalogShard) { + return {ErrorCodes::OperationFailed, + str::stream() << "Cannot add " << connectionString.toString() + << " as a shard since it is a config server"}; } if (resIsMaster.hasField(HelloCommandReply::kIsImplicitDefaultMajorityWCFieldName) && |