diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-01-24 08:39:12 -0500 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-01-29 13:43:56 -0500 |
commit | 1162812624d110c52ac73a548f43b2d7f9ecf46c (patch) | |
tree | 7fe0bcbd604e654302ca83be3484a30c99a0c0a5 /src/mongo/db/s | |
parent | 2487ab101a42434e1f61e68ee7c2383432861f8b (diff) | |
download | mongo-1162812624d110c52ac73a548f43b2d7f9ecf46c.tar.gz |
SERVER-32901 Consolidate sharding libraries
Also gets rid of most usages of the std::string variant of
CollectionShardingState::get.
Diffstat (limited to 'src/mongo/db/s')
19 files changed, 23 insertions, 26 deletions
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index c6929a5c1b1..b5c82cdae1d 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -106,7 +106,6 @@ env.Library( '$BUILD_DIR/mongo/s/coreshard', '$BUILD_DIR/mongo/s/is_mongos', '$BUILD_DIR/mongo/s/sharding_initialization', - '$BUILD_DIR/mongo/s/sharding_request_types', '$BUILD_DIR/mongo/util/elapsed_tracker', 'balancer', 'collection_metadata', @@ -205,7 +204,6 @@ env.Library( '$BUILD_DIR/mongo/db/rw_concern_d', '$BUILD_DIR/mongo/s/catalog/sharding_catalog_manager', '$BUILD_DIR/mongo/s/commands/shared_cluster_commands', - '$BUILD_DIR/mongo/s/sharding_request_types', 'balancer', 'collection_metadata', 'sharding', diff --git a/src/mongo/db/s/active_migrations_registry.h b/src/mongo/db/s/active_migrations_registry.h index 982cb2f8b26..a36699d09cf 100644 --- a/src/mongo/db/s/active_migrations_registry.h +++ b/src/mongo/db/s/active_migrations_registry.h @@ -32,7 +32,7 @@ #include "mongo/base/disallow_copying.h" #include "mongo/db/s/migration_session_id.h" -#include "mongo/s/move_chunk_request.h" +#include "mongo/s/request_types/move_chunk_request.h" #include "mongo/stdx/memory.h" #include "mongo/stdx/mutex.h" #include "mongo/util/concurrency/notification.h" diff --git a/src/mongo/db/s/active_migrations_registry_test.cpp b/src/mongo/db/s/active_migrations_registry_test.cpp index 7907434e0d0..d336ba0362d 100644 --- a/src/mongo/db/s/active_migrations_registry_test.cpp +++ b/src/mongo/db/s/active_migrations_registry_test.cpp @@ -33,7 +33,7 @@ #include "mongo/db/client.h" #include "mongo/db/s/active_migrations_registry.h" #include "mongo/db/service_context_noop.h" -#include "mongo/s/move_chunk_request.h" +#include "mongo/s/request_types/move_chunk_request.h" #include "mongo/unittest/unittest.h" namespace mongo { diff --git a/src/mongo/db/s/balancer/migration_manager.cpp b/src/mongo/db/s/balancer/migration_manager.cpp index 5eb1d625b3e..0beffad2508 100644 --- a/src/mongo/db/s/balancer/migration_manager.cpp +++ b/src/mongo/db/s/balancer/migration_manager.cpp @@ -48,7 +48,7 @@ #include "mongo/s/catalog_cache.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" -#include "mongo/s/move_chunk_request.h" +#include "mongo/s/request_types/move_chunk_request.h" #include "mongo/util/log.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/s/balancer/migration_manager.h b/src/mongo/db/s/balancer/migration_manager.h index a99b5696d80..4d5418b1066 100644 --- a/src/mongo/db/s/balancer/migration_manager.h +++ b/src/mongo/db/s/balancer/migration_manager.h @@ -39,7 +39,7 @@ #include "mongo/db/s/balancer/type_migration.h" #include "mongo/executor/task_executor.h" #include "mongo/s/catalog/dist_lock_manager.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" #include "mongo/stdx/unordered_map.h" diff --git a/src/mongo/db/s/balancer/migration_manager_test.cpp b/src/mongo/db/s/balancer/migration_manager_test.cpp index 82be67e10a4..70718a25504 100644 --- a/src/mongo/db/s/balancer/migration_manager_test.cpp +++ b/src/mongo/db/s/balancer/migration_manager_test.cpp @@ -41,7 +41,7 @@ #include "mongo/s/catalog/type_locks.h" #include "mongo/s/catalog/type_shard.h" #include "mongo/s/config_server_test_fixture.h" -#include "mongo/s/move_chunk_request.h" +#include "mongo/s/request_types/move_chunk_request.h" #include "mongo/stdx/memory.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/s/balancer/scoped_migration_request.h b/src/mongo/db/s/balancer/scoped_migration_request.h index b3f100d92d6..de56546b955 100644 --- a/src/mongo/db/s/balancer/scoped_migration_request.h +++ b/src/mongo/db/s/balancer/scoped_migration_request.h @@ -30,7 +30,7 @@ #include "mongo/base/status_with.h" #include "mongo/db/s/balancer/balancer_policy.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" namespace mongo { diff --git a/src/mongo/db/s/balancer/scoped_migration_request_test.cpp b/src/mongo/db/s/balancer/scoped_migration_request_test.cpp index 10fb8da0e22..1aab0157210 100644 --- a/src/mongo/db/s/balancer/scoped_migration_request_test.cpp +++ b/src/mongo/db/s/balancer/scoped_migration_request_test.cpp @@ -33,7 +33,7 @@ #include "mongo/db/s/balancer/type_migration.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/config_server_test_fixture.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" namespace mongo { namespace { diff --git a/src/mongo/db/s/chunk_move_write_concern_options.cpp b/src/mongo/db/s/chunk_move_write_concern_options.cpp index 641571c2e2b..2f2d7452b7b 100644 --- a/src/mongo/db/s/chunk_move_write_concern_options.cpp +++ b/src/mongo/db/s/chunk_move_write_concern_options.cpp @@ -36,7 +36,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator_global.h" #include "mongo/db/service_context.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/s/cleanup_orphaned_cmd.cpp b/src/mongo/db/s/cleanup_orphaned_cmd.cpp index 623312b1cdd..afadefadbd4 100644 --- a/src/mongo/db/s/cleanup_orphaned_cmd.cpp +++ b/src/mongo/db/s/cleanup_orphaned_cmd.cpp @@ -47,7 +47,7 @@ #include "mongo/db/s/collection_sharding_state.h" #include "mongo/db/s/sharding_state.h" #include "mongo/db/service_context.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" #include "mongo/util/log.h" namespace mongo { @@ -77,7 +77,7 @@ CleanupResult cleanupOrphanedData(OperationContext* opCtx, { AutoGetCollection autoColl(opCtx, ns, MODE_IX); - const auto css = CollectionShardingState::get(opCtx, ns.toString()); + const auto css = CollectionShardingState::get(opCtx, ns); auto metadata = css->getMetadata(); if (!metadata) { log() << "skipping orphaned data cleanup for " << ns.toString() diff --git a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp index 64cc9986f58..00cfa9f1710 100644 --- a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp +++ b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp @@ -56,7 +56,7 @@ #include "mongo/s/client/shard_registry.h" #include "mongo/s/config_server_client.h" #include "mongo/s/grid.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" #include "mongo/s/request_types/shard_collection_gen.h" #include "mongo/s/shard_util.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp index da9755d5383..4e8c9c768e0 100644 --- a/src/mongo/db/s/merge_chunks_command.cpp +++ b/src/mongo/db/s/merge_chunks_command.cpp @@ -60,7 +60,7 @@ bool checkMetadataForSuccess(OperationContext* opCtx, const BSONObj& maxKey) { const auto metadataAfterMerge = [&] { AutoGetCollection autoColl(opCtx, nss, MODE_IS); - return CollectionShardingState::get(opCtx, nss.ns())->getMetadata(); + return CollectionShardingState::get(opCtx, nss)->getMetadata(); }(); uassert(ErrorCodes::StaleEpoch, @@ -115,7 +115,7 @@ Status mergeChunks(OperationContext* opCtx, const auto metadata = [&] { AutoGetCollection autoColl(opCtx, nss, MODE_IS); - return CollectionShardingState::get(opCtx, nss.ns())->getMetadata(); + return CollectionShardingState::get(opCtx, nss)->getMetadata(); }(); if (!metadata) { diff --git a/src/mongo/db/s/migration_chunk_cloner_source_legacy.h b/src/mongo/db/s/migration_chunk_cloner_source_legacy.h index 1bdad9ee4c7..28981b21c15 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_legacy.h +++ b/src/mongo/db/s/migration_chunk_cloner_source_legacy.h @@ -39,7 +39,7 @@ #include "mongo/db/s/migration_chunk_cloner_source.h" #include "mongo/db/s/migration_session_id.h" #include "mongo/db/s/session_catalog_migration_source.h" -#include "mongo/s/move_chunk_request.h" +#include "mongo/s/request_types/move_chunk_request.h" #include "mongo/s/shard_key_pattern.h" #include "mongo/stdx/memory.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp b/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp index 007288ff96d..c598a5db337 100644 --- a/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp +++ b/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp @@ -45,7 +45,7 @@ #include "mongo/db/s/chunk_move_write_concern_options.h" #include "mongo/db/s/sharding_state.h" #include "mongo/s/chunk_version.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" #include "mongo/util/assert_util.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index f50e23bb550..7e931c1979f 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -51,7 +51,7 @@ #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" #include "mongo/s/request_types/commit_chunk_migration_request_type.h" -#include "mongo/s/set_shard_version_request.h" +#include "mongo/s/request_types/set_shard_version_request.h" #include "mongo/s/shard_key_pattern.h" #include "mongo/s/stale_exception.h" #include "mongo/stdx/memory.h" @@ -240,7 +240,7 @@ Status MigrationSourceManager::startClone(OperationContext* opCtx) { { // Register for notifications from the replication subsystem AutoGetCollection autoColl(opCtx, getNss(), MODE_IX, MODE_X); - auto css = CollectionShardingState::get(opCtx, getNss().ns()); + auto css = CollectionShardingState::get(opCtx, getNss()); const auto metadata = css->getMetadata(); Status status = checkCollectionEpochMatches(metadata, _collectionEpoch); @@ -650,8 +650,7 @@ void MigrationSourceManager::_cleanup(OperationContext* opCtx) { auto cloneDriver = [&]() { // Unregister from the collection's sharding state AutoGetCollection autoColl(opCtx, getNss(), MODE_IX, MODE_X); - - auto css = CollectionShardingState::get(opCtx, getNss().ns()); + auto css = CollectionShardingState::get(opCtx, getNss()); // The migration source manager is not visible anymore after it is unregistered from the // collection diff --git a/src/mongo/db/s/migration_source_manager.h b/src/mongo/db/s/migration_source_manager.h index 635fed591f7..050fd8e43bf 100644 --- a/src/mongo/db/s/migration_source_manager.h +++ b/src/mongo/db/s/migration_source_manager.h @@ -32,7 +32,7 @@ #include "mongo/base/disallow_copying.h" #include "mongo/db/s/collection_sharding_state.h" -#include "mongo/s/move_chunk_request.h" +#include "mongo/s/request_types/move_chunk_request.h" #include "mongo/util/concurrency/notification.h" #include "mongo/util/timer.h" diff --git a/src/mongo/db/s/move_chunk_command.cpp b/src/mongo/db/s/move_chunk_command.cpp index f736f1b8d2e..c2dbc58e076 100644 --- a/src/mongo/db/s/move_chunk_command.cpp +++ b/src/mongo/db/s/move_chunk_command.cpp @@ -43,8 +43,8 @@ #include "mongo/db/s/sharding_state.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" -#include "mongo/s/migration_secondary_throttle_options.h" -#include "mongo/s/move_chunk_request.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/move_chunk_request.h" #include "mongo/util/concurrency/notification.h" #include "mongo/util/fail_point_service.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/s/split_chunk.cpp b/src/mongo/db/s/split_chunk.cpp index 181fa43c1fa..c8c9015a1d3 100644 --- a/src/mongo/db/s/split_chunk.cpp +++ b/src/mongo/db/s/split_chunk.cpp @@ -97,7 +97,7 @@ bool checkMetadataForSuccessfulSplitChunk(OperationContext* opCtx, const std::vector<BSONObj>& splitKeys) { const auto metadataAfterSplit = [&] { AutoGetCollection autoColl(opCtx, nss, MODE_IS); - return CollectionShardingState::get(opCtx, nss.ns())->getMetadata(); + return CollectionShardingState::get(opCtx, nss)->getMetadata(); }(); uassert(ErrorCodes::StaleEpoch, diff --git a/src/mongo/db/s/start_chunk_clone_request.h b/src/mongo/db/s/start_chunk_clone_request.h index 8b21a664243..8f2700d863c 100644 --- a/src/mongo/db/s/start_chunk_clone_request.h +++ b/src/mongo/db/s/start_chunk_clone_request.h @@ -33,7 +33,7 @@ #include "mongo/client/connection_string.h" #include "mongo/db/namespace_string.h" #include "mongo/db/s/migration_session_id.h" -#include "mongo/s/migration_secondary_throttle_options.h" +#include "mongo/s/request_types/migration_secondary_throttle_options.h" #include "mongo/s/shard_id.h" namespace mongo { |