diff options
Diffstat (limited to 'src/mongo/s/catalog/sharding_catalog_manager_zone_operations_impl.cpp')
| -rw-r--r-- | src/mongo/s/catalog/sharding_catalog_manager_zone_operations_impl.cpp | 87 |
1 files changed, 42 insertions, 45 deletions
diff --git a/src/mongo/s/catalog/sharding_catalog_manager_zone_operations_impl.cpp b/src/mongo/s/catalog/sharding_catalog_manager_zone_operations_impl.cpp index 6af584d3c30..6c94eaad829 100644 --- a/src/mongo/s/catalog/sharding_catalog_manager_zone_operations_impl.cpp +++ b/src/mongo/s/catalog/sharding_catalog_manager_zone_operations_impl.cpp @@ -66,13 +66,13 @@ Status checkForOveralappedZonedKeyRange(OperationContext* txn, const KeyPattern& shardKeyPattern) { DistributionStatus chunkDist(ns, ShardToChunksMap{}); - auto tagStatus = configServer->exhaustiveFindOnConfig(txn, - kConfigPrimarySelector, - repl::ReadConcernLevel::kLocalReadConcern, - NamespaceString(TagsType::ConfigNS), - BSON(TagsType::ns(ns.ns())), - BSONObj(), - 0); + auto tagStatus = configServer->exhaustiveFind(txn, + kConfigPrimarySelector, + repl::ReadConcernLevel::kLocalReadConcern, + NamespaceString(TagsType::ConfigNS), + BSON(TagsType::ns(ns.ns())), + BSONObj(), + 0); if (!tagStatus.isOK()) { return tagStatus.getStatus(); } @@ -117,14 +117,13 @@ StatusWith<ChunkRange> includeFullShardKey(OperationContext* txn, const NamespaceString& ns, const ChunkRange& range, KeyPattern* shardKeyPatternOut) { - auto findCollStatus = - configServer->exhaustiveFindOnConfig(txn, - kConfigPrimarySelector, - repl::ReadConcernLevel::kLocalReadConcern, - NamespaceString(CollectionType::ConfigNS), - BSON(CollectionType::fullNs(ns.ns())), - BSONObj(), - 1); + auto findCollStatus = configServer->exhaustiveFind(txn, + kConfigPrimarySelector, + repl::ReadConcernLevel::kLocalReadConcern, + NamespaceString(CollectionType::ConfigNS), + BSON(CollectionType::fullNs(ns.ns())), + BSONObj(), + 1); if (!findCollStatus.isOK()) { return findCollStatus.getStatus(); @@ -210,13 +209,13 @@ Status ShardingCatalogManagerImpl::removeShardFromZone(OperationContext* txn, // auto findShardExistsStatus = - configShard->exhaustiveFindOnConfig(txn, - kConfigPrimarySelector, - repl::ReadConcernLevel::kLocalReadConcern, - shardNS, - BSON(ShardType::name() << shardName), - BSONObj(), - 1); + configShard->exhaustiveFind(txn, + kConfigPrimarySelector, + repl::ReadConcernLevel::kLocalReadConcern, + shardNS, + BSON(ShardType::name() << shardName), + BSONObj(), + 1); if (!findShardExistsStatus.isOK()) { return findShardExistsStatus.getStatus(); @@ -231,14 +230,13 @@ Status ShardingCatalogManagerImpl::removeShardFromZone(OperationContext* txn, // Check how many shards belongs to this zone. // - auto findShardStatus = - configShard->exhaustiveFindOnConfig(txn, - kConfigPrimarySelector, - repl::ReadConcernLevel::kLocalReadConcern, - shardNS, - BSON(ShardType::tags() << zoneName), - BSONObj(), - 2); + auto findShardStatus = configShard->exhaustiveFind(txn, + kConfigPrimarySelector, + repl::ReadConcernLevel::kLocalReadConcern, + shardNS, + BSON(ShardType::tags() << zoneName), + BSONObj(), + 2); if (!findShardStatus.isOK()) { return findShardStatus.getStatus(); @@ -265,13 +263,13 @@ Status ShardingCatalogManagerImpl::removeShardFromZone(OperationContext* txn, } auto findChunkRangeStatus = - configShard->exhaustiveFindOnConfig(txn, - kConfigPrimarySelector, - repl::ReadConcernLevel::kLocalReadConcern, - NamespaceString(TagsType::ConfigNS), - BSON(TagsType::tag() << zoneName), - BSONObj(), - 1); + configShard->exhaustiveFind(txn, + kConfigPrimarySelector, + repl::ReadConcernLevel::kLocalReadConcern, + NamespaceString(TagsType::ConfigNS), + BSON(TagsType::tag() << zoneName), + BSONObj(), + 1); if (!findChunkRangeStatus.isOK()) { return findChunkRangeStatus.getStatus(); @@ -326,14 +324,13 @@ Status ShardingCatalogManagerImpl::assignKeyRangeToZone(OperationContext* txn, const auto& fullShardKeyRange = fullShardKeyStatus.getValue(); - auto zoneExistStatus = - configServer->exhaustiveFindOnConfig(txn, - kConfigPrimarySelector, - repl::ReadConcernLevel::kLocalReadConcern, - NamespaceString(ShardType::ConfigNS), - BSON(ShardType::tags() << zoneName), - BSONObj(), - 1); + auto zoneExistStatus = configServer->exhaustiveFind(txn, + kConfigPrimarySelector, + repl::ReadConcernLevel::kLocalReadConcern, + NamespaceString(ShardType::ConfigNS), + BSON(ShardType::tags() << zoneName), + BSONObj(), + 1); if (!zoneExistStatus.isOK()) { return zoneExistStatus.getStatus(); |