diff options
author | Tess Avitabile <tess.avitabile@mongodb.com> | 2018-02-27 17:51:41 -0500 |
---|---|---|
committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2018-03-02 17:21:41 -0500 |
commit | b1624b3fb1fe7eaf4554682d02c57abc519db819 (patch) | |
tree | 87791d227aed63623028ee51dbd6c5f585654962 | |
parent | 70e200e98474d1a29339bf536f348257e8f83a9d (diff) | |
download | mongo-b1624b3fb1fe7eaf4554682d02c57abc519db819.tar.gz |
SERVER-33336 Snapshot reads should not take MODE_IX locks when autocommit=true
46 files changed, 96 insertions, 90 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index b9cb84dac26..540b4ac0a0d 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -562,7 +562,7 @@ env.CppUnitTest( ], ) -# TODO: This library should probably be folded into catalog/catalog, +# TODO: This library should probably be folded into catalog_raii, # with which it is currently circular. env.Library( target='db_raii', @@ -570,7 +570,7 @@ env.Library( 'db_raii.cpp', ], LIBDEPS=[ - 'catalog/catalog_raii', + 'catalog_raii', 'curop', 's/sharding', 'stats/top', @@ -578,6 +578,48 @@ env.Library( ) env.Library( + target='catalog_raii', + source=[ + 'catalog_raii.cpp', + 'retryable_writes_stats.cpp', + 'session.cpp', + 'session_catalog.cpp', + 'transaction_history_iterator.cpp', + env.Idlc('session_txn_record.idl')[0], + env.Idlc('transactions_stats.idl')[0], + ], + LIBDEPS=[ + '$BUILD_DIR/mongo/idl/idl_parser', + 'catalog/collection', + 'catalog/database', + 'catalog/database_holder', + 'catalog/uuid_catalog', + 'commands/server_status', + 'concurrency/lock_manager', + 'curop_metrics', + 'dbdirectclient', + 'index/index_access_method', + 'logical_session_id', + 'namespace_string', + 'repl/oplog_entry', + 'views/views', + ], +) + +env.CppUnitTest( + target='catalog_raii_test', + source=[ + 'catalog_raii_test.cpp', + ], + LIBDEPS=[ + 'auth/authorization_manager_mock_init', + 'catalog/database_holder_mock', + 'catalog_raii', + 'service_context_noop_init', + ], +) + +env.Library( target='dbdirectclient', source=[ 'dbdirectclient.cpp', @@ -1687,29 +1729,17 @@ env.Library( 'ops/insert.cpp', 'ops/update.cpp', 'ops/write_ops_retryability.cpp', - 'retryable_writes_stats.cpp', - 'session.cpp', - 'session_catalog.cpp', - 'transaction_history_iterator.cpp', env.Idlc('ops/single_write_result.idl')[0], - env.Idlc('session_txn_record.idl')[0], - env.Idlc('transactions_stats.idl')[0], ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/idl/idl_parser', + 'catalog_raii', 'catalog/collection_info_cache', 'concurrency/lock_manager', - 'curop_metrics', - 'dbdirectclient', - 'index/index_access_method', 'introspect', - 'logical_session_id', 'matcher/expressions_mongod_only', - 'namespace_string', 'query_exec', 'query/command_request_response', - 'repl/oplog_entry', 'repl/repl_coordinator_interface', 'service_context', 'update/update_driver', diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript index 3ba44290c72..5aa69e986c2 100644 --- a/src/mongo/db/catalog/SConscript +++ b/src/mongo/db/catalog/SConscript @@ -132,34 +132,6 @@ env.Library( ], ) -env.Library( - target='catalog_raii', - source=[ - 'catalog_raii.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/catalog/database_holder', - '$BUILD_DIR/mongo/db/concurrency/lock_manager', - '$BUILD_DIR/mongo/db/views/views', - 'collection', - 'database', - 'uuid_catalog', - ], -) - -env.CppUnitTest( - target='catalog_raii_test', - source=[ - 'catalog_raii_test.cpp', - ], - LIBDEPS=[ - 'database_holder_mock', - '$BUILD_DIR/mongo/db/catalog/catalog_raii', - '$BUILD_DIR/mongo/db/service_context_noop_init', - '$BUILD_DIR/mongo/db/auth/authorization_manager_mock_init', - ], -) - env.CppUnitTest( target='database_test', source=[ diff --git a/src/mongo/db/catalog/capped_utils.cpp b/src/mongo/db/catalog/capped_utils.cpp index 47ac06fb385..6355add953b 100644 --- a/src/mongo/db/catalog/capped_utils.cpp +++ b/src/mongo/db/catalog/capped_utils.cpp @@ -34,13 +34,13 @@ #include "mongo/base/error_codes.h" #include "mongo/db/background.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/collection_catalog_entry.h" #include "mongo/db/catalog/create_collection.h" #include "mongo/db/catalog/document_validation.h" #include "mongo/db/catalog/drop_collection.h" #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/catalog/rename_collection.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/curop.h" diff --git a/src/mongo/db/catalog/drop_database.cpp b/src/mongo/db/catalog/drop_database.cpp index b2e4853eb8f..d121dbbfdb2 100644 --- a/src/mongo/db/catalog/drop_database.cpp +++ b/src/mongo/db/catalog/drop_database.cpp @@ -35,7 +35,7 @@ #include <algorithm> #include "mongo/db/background.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/curop.h" diff --git a/src/mongo/db/catalog/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp index 379f40c982a..74065935280 100644 --- a/src/mongo/db/catalog/catalog_raii.cpp +++ b/src/mongo/db/catalog_raii.cpp @@ -28,7 +28,7 @@ #include "mongo/platform/basic.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/catalog/uuid_catalog.h" diff --git a/src/mongo/db/catalog/catalog_raii.h b/src/mongo/db/catalog_raii.h index 70d71382b35..70d71382b35 100644 --- a/src/mongo/db/catalog/catalog_raii.h +++ b/src/mongo/db/catalog_raii.h diff --git a/src/mongo/db/catalog/catalog_raii_test.cpp b/src/mongo/db/catalog_raii_test.cpp index 46fc00a4758..75d7f74ec63 100644 --- a/src/mongo/db/catalog/catalog_raii_test.cpp +++ b/src/mongo/db/catalog_raii_test.cpp @@ -32,7 +32,7 @@ #include <string> -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/d_concurrency.h" #include "mongo/db/concurrency/lock_state.h" diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp index ce56e6a61b0..f4950c06d5b 100644 --- a/src/mongo/db/commands/dbcommands.cpp +++ b/src/mongo/db/commands/dbcommands.cpp @@ -46,13 +46,13 @@ #include "mongo/db/auth/user_management_commands_parser.h" #include "mongo/db/auth/user_name.h" #include "mongo/db/background.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/coll_mod.h" #include "mongo/db/catalog/create_collection.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/catalog/drop_collection.h" #include "mongo/db/catalog/drop_database.h" #include "mongo/db/catalog/index_key_validate.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/clientcursor.h" #include "mongo/db/commands.h" #include "mongo/db/commands/server_status.h" diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp index 271d5433196..e4477c9a418 100644 --- a/src/mongo/db/commands/list_databases.cpp +++ b/src/mongo/db/commands/list_databases.cpp @@ -31,8 +31,8 @@ #include "mongo/platform/basic.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/database_catalog_entry.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/matcher/expression.h" diff --git a/src/mongo/db/db_raii.cpp b/src/mongo/db/db_raii.cpp index b6fa5158000..6b9a695d02b 100644 --- a/src/mongo/db/db_raii.cpp +++ b/src/mongo/db/db_raii.cpp @@ -34,6 +34,7 @@ #include "mongo/db/curop.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/collection_sharding_state.h" +#include "mongo/db/session_catalog.h" namespace mongo { namespace { @@ -232,9 +233,12 @@ OldClientWriteContext::OldClientWriteContext(OperationContext* opCtx, StringData LockMode getLockModeForQuery(OperationContext* opCtx) { invariant(opCtx); - if (repl::ReadConcernArgs::get(opCtx).getLevel() == - repl::ReadConcernLevel::kSnapshotReadConcern) { - return MODE_IX; + // Use IX locks for autocommit:false multi-statement transactions; otherwise, use IS locks. + if (opCtx->getWriteUnitOfWork()) { + invariant(OperationContextSession::get(opCtx)); + if (!OperationContextSession::get(opCtx)->getAutocommit()) { + return MODE_IX; + } } return MODE_IS; diff --git a/src/mongo/db/db_raii.h b/src/mongo/db/db_raii.h index 0639ce03704..c20968be550 100644 --- a/src/mongo/db/db_raii.h +++ b/src/mongo/db/db_raii.h @@ -30,7 +30,7 @@ #include <string> -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/stats/top.h" #include "mongo/util/timer.h" diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript index 6b7d0803fe5..4ed8aa31be1 100644 --- a/src/mongo/db/matcher/SConscript +++ b/src/mongo/db/matcher/SConscript @@ -166,10 +166,10 @@ env.Library( '$BUILD_DIR/mongo/db/fts/base_fts', '$BUILD_DIR/mongo/scripting/scripting_server', 'expressions', - '$BUILD_DIR/mongo/db/catalog/catalog_raii', '$BUILD_DIR/mongo/db/catalog/collection', '$BUILD_DIR/mongo/db/catalog/database', '$BUILD_DIR/mongo/db/catalog/index_catalog', + '$BUILD_DIR/mongo/db/catalog_raii', ], ) diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript index 92936e6f8bd..1e077f4f4ab 100644 --- a/src/mongo/db/ops/SConscript +++ b/src/mongo/db/ops/SConscript @@ -11,7 +11,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/catalog/catalog_raii', + '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/repl/oplog', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp index 0a9ec92362b..4ef8b7edd41 100644 --- a/src/mongo/db/ops/write_ops_exec.cpp +++ b/src/mongo/db/ops/write_ops_exec.cpp @@ -35,10 +35,10 @@ #include "mongo/base/checked_cast.h" #include "mongo/db/audit.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/catalog/document_validation.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/curop_metrics.h" @@ -654,7 +654,7 @@ static SingleWriteResult performSingleUpdateOp(OperationContext* opCtx, WriteResult performUpdates(OperationContext* opCtx, const write_ops::Update& wholeOp) { // Update performs its own retries, so we should not be in a WriteUnitOfWork unless we are in a // transaction. - invariant(opCtx->getWriteUnitOfWork() || !opCtx->lockState()->inAWriteUnitOfWork()); + invariant(!opCtx->lockState()->inAWriteUnitOfWork() || opCtx->getWriteUnitOfWork()); uassertStatusOK(userAllowedWriteNS(wholeOp.getNamespace())); DisableDocumentValidationIfTrue docValidationDisabler( diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp index 729348e07bb..88ce5464b24 100644 --- a/src/mongo/db/repl/rs_rollback.cpp +++ b/src/mongo/db/repl/rs_rollback.cpp @@ -39,13 +39,13 @@ #include "mongo/bson/util/bson_extract.h" #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_manager_global.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/collection_catalog_entry.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/catalog/document_validation.h" #include "mongo/db/catalog/index_catalog.h" #include "mongo/db/catalog/rename_collection.h" #include "mongo/db/catalog/uuid_catalog.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/concurrency/write_conflict_exception.h" diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp index 339e40df721..4cb3b7e1ad3 100644 --- a/src/mongo/db/repl/sync_tail.cpp +++ b/src/mongo/db/repl/sync_tail.cpp @@ -40,12 +40,12 @@ #include "mongo/bson/bsonelement_comparator.h" #include "mongo/bson/timestamp.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/catalog/document_validation.h" #include "mongo/db/catalog/uuid_catalog.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands/fsync.h" #include "mongo/db/commands/server_status_metric.h" diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript index da09c41fdf2..12ab8fac01f 100644 --- a/src/mongo/db/s/SConscript +++ b/src/mongo/db/s/SConscript @@ -100,9 +100,9 @@ env.Library( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/bson/dotted_path_support', - '$BUILD_DIR/mongo/db/catalog/catalog_raii', '$BUILD_DIR/mongo/db/catalog/index_catalog', '$BUILD_DIR/mongo/db/catalog/index_create', + '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/commands/dcommands_fcv', '$BUILD_DIR/mongo/db/commands/server_status', '$BUILD_DIR/mongo/db/common', @@ -174,8 +174,8 @@ env.Library( 'config/sharding_catalog_manager_zone_operations.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/catalog/catalog_raii', '$BUILD_DIR/mongo/db/catalog/collection_options', + '$BUILD_DIR/mongo/db/catalog_raii', '$BUILD_DIR/mongo/db/commands/dcommands_fcv', '$BUILD_DIR/mongo/db/repl/read_concern_args', '$BUILD_DIR/mongo/executor/network_interface', diff --git a/src/mongo/db/s/active_migrations_registry.cpp b/src/mongo/db/s/active_migrations_registry.cpp index 17f5bb1e94f..e98497d90f9 100644 --- a/src/mongo/db/s/active_migrations_registry.cpp +++ b/src/mongo/db/s/active_migrations_registry.cpp @@ -31,7 +31,7 @@ #include "mongo/db/s/active_migrations_registry.h" #include "mongo/base/status_with.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/s/collection_sharding_state.h" #include "mongo/db/s/migration_session_id.h" #include "mongo/db/s/migration_source_manager.h" diff --git a/src/mongo/db/s/check_sharding_index_command.cpp b/src/mongo/db/s/check_sharding_index_command.cpp index dac697a10af..2d0d499fb1b 100644 --- a/src/mongo/db/s/check_sharding_index_command.cpp +++ b/src/mongo/db/s/check_sharding_index_command.cpp @@ -35,8 +35,8 @@ #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" #include "mongo/db/bson/dotted_path_support.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/index_catalog.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/working_set_common.h" diff --git a/src/mongo/db/s/cleanup_orphaned_cmd.cpp b/src/mongo/db/s/cleanup_orphaned_cmd.cpp index 5a52aa4b13f..bd4716401a9 100644 --- a/src/mongo/db/s/cleanup_orphaned_cmd.cpp +++ b/src/mongo/db/s/cleanup_orphaned_cmd.cpp @@ -37,7 +37,7 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/field_parser.h" #include "mongo/db/jsobj.h" diff --git a/src/mongo/db/s/collection_range_deleter.cpp b/src/mongo/db/s/collection_range_deleter.cpp index 6c0fc7b0bf6..b575538ecc8 100644 --- a/src/mongo/db/s/collection_range_deleter.cpp +++ b/src/mongo/db/s/collection_range_deleter.cpp @@ -35,8 +35,8 @@ #include <algorithm> #include <utility> -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/index_catalog.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/dbhelpers.h" diff --git a/src/mongo/db/s/collection_range_deleter_test.cpp b/src/mongo/db/s/collection_range_deleter_test.cpp index 1b6bb61928f..df1f28be264 100644 --- a/src/mongo/db/s/collection_range_deleter_test.cpp +++ b/src/mongo/db/s/collection_range_deleter_test.cpp @@ -32,7 +32,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/query.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/index/index_descriptor.h" diff --git a/src/mongo/db/s/collection_sharding_state.cpp b/src/mongo/db/s/collection_sharding_state.cpp index e40723cfca7..6909fc6e4c6 100644 --- a/src/mongo/db/s/collection_sharding_state.cpp +++ b/src/mongo/db/s/collection_sharding_state.cpp @@ -34,7 +34,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/util/bson_extract.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" diff --git a/src/mongo/db/s/collection_sharding_state_test.cpp b/src/mongo/db/s/collection_sharding_state_test.cpp index 3f64a1be7d2..ee083fec502 100644 --- a/src/mongo/db/s/collection_sharding_state_test.cpp +++ b/src/mongo/db/s/collection_sharding_state_test.cpp @@ -27,7 +27,7 @@ #include "mongo/platform/basic.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/namespace_string.h" #include "mongo/db/s/collection_sharding_state.h" #include "mongo/db/s/sharding_state.h" diff --git a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp index 365255fe542..ea34e097844 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp @@ -37,7 +37,7 @@ #include "mongo/bson/util/bson_extract.h" #include "mongo/client/connection_string.h" #include "mongo/client/read_preference.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/s/config/sharding_catalog_manager_config_initialization_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_config_initialization_test.cpp index 151d1a888a7..e167fa4b586 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_config_initialization_test.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_config_initialization_test.cpp @@ -32,7 +32,7 @@ #include <vector> #include "mongo/bson/json.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/curop.h" #include "mongo/db/namespace_string.h" 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 5d93e1d7a62..8efcf770aa1 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 @@ -43,7 +43,7 @@ #include "mongo/client/remote_command_targeter.h" #include "mongo/client/replica_set_monitor.h" #include "mongo/db/audit.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands/feature_compatibility_version.h" #include "mongo/db/namespace_string.h" diff --git a/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp b/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp index cce69cf4132..660e86ee436 100644 --- a/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp +++ b/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp @@ -35,7 +35,7 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/s/get_shard_version_command.cpp b/src/mongo/db/s/get_shard_version_command.cpp index 60c868a2b9e..17a2d4d6318 100644 --- a/src/mongo/db/s/get_shard_version_command.cpp +++ b/src/mongo/db/s/get_shard_version_command.cpp @@ -35,7 +35,7 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/s/collection_sharding_state.h" #include "mongo/db/s/sharded_connection_info.h" diff --git a/src/mongo/db/s/implicit_create_collection.cpp b/src/mongo/db/s/implicit_create_collection.cpp index 17f68349c30..b1b30cc4bf7 100644 --- a/src/mongo/db/s/implicit_create_collection.cpp +++ b/src/mongo/db/s/implicit_create_collection.cpp @@ -36,7 +36,7 @@ #include <memory> #include <string> -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp index 377a9dc8b99..0458815e990 100644 --- a/src/mongo/db/s/merge_chunks_command.cpp +++ b/src/mongo/db/s/merge_chunks_command.cpp @@ -33,7 +33,7 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/field_parser.h" #include "mongo/db/namespace_string.h" diff --git a/src/mongo/db/s/metadata_manager_test.cpp b/src/mongo/db/s/metadata_manager_test.cpp index c66835e5135..9c8e670dc2b 100644 --- a/src/mongo/db/s/metadata_manager_test.cpp +++ b/src/mongo/db/s/metadata_manager_test.cpp @@ -32,7 +32,7 @@ #include "mongo/bson/bsonobjbuilder.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/jsobj.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp b/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp index 1cf3c4e8edc..6660ac6366d 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp @@ -34,8 +34,8 @@ #include "mongo/base/status.h" #include "mongo/client/read_preference.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/index_catalog.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/plan_stage.h" #include "mongo/db/exec/working_set_common.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source_legacy_commands.cpp b/src/mongo/db/s/migration_chunk_cloner_source_legacy_commands.cpp index dcf921e37ee..a4506ed67a6 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_legacy_commands.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_legacy_commands.cpp @@ -35,7 +35,7 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/s/collection_sharding_state.h" diff --git a/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp b/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp index 4025dbca918..34d91019d5e 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_legacy_test.cpp @@ -29,7 +29,7 @@ #include "mongo/platform/basic.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/replication_coordinator_mock.h" diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index c4091b19f0a..d31aa650556 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -33,7 +33,7 @@ #include "mongo/db/s/migration_source_manager.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/replication_coordinator.h" diff --git a/src/mongo/db/s/session_catalog_migration_source.cpp b/src/mongo/db/s/session_catalog_migration_source.cpp index c3b96f0302f..301c9dc40d4 100644 --- a/src/mongo/db/s/session_catalog_migration_source.cpp +++ b/src/mongo/db/s/session_catalog_migration_source.cpp @@ -30,7 +30,7 @@ #include "mongo/db/s/session_catalog_migration_source.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/namespace_string.h" diff --git a/src/mongo/db/s/set_shard_version_command.cpp b/src/mongo/db/s/set_shard_version_command.cpp index fb2412f9a69..73227b9e1fb 100644 --- a/src/mongo/db/s/set_shard_version_command.cpp +++ b/src/mongo/db/s/set_shard_version_command.cpp @@ -35,7 +35,7 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/lasterror.h" diff --git a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp index 224dd05ccab..7a8277fb2b1 100644 --- a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp +++ b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp @@ -32,7 +32,7 @@ #include "mongo/db/s/shard_filtering_metadata_refresh.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/operation_context.h" #include "mongo/db/s/collection_sharding_state.h" #include "mongo/db/s/operation_sharding_state.h" diff --git a/src/mongo/db/s/sharding_state.cpp b/src/mongo/db/s/sharding_state.cpp index 467db2051a0..ae3a93d098b 100644 --- a/src/mongo/db/s/sharding_state.cpp +++ b/src/mongo/db/s/sharding_state.cpp @@ -37,7 +37,7 @@ #include "mongo/client/connection_string.h" #include "mongo/client/replica_set_monitor.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/s/sharding_state_recovery.cpp b/src/mongo/db/s/sharding_state_recovery.cpp index 5b56f7a62c8..d5d7886c541 100644 --- a/src/mongo/db/s/sharding_state_recovery.cpp +++ b/src/mongo/db/s/sharding_state_recovery.cpp @@ -35,7 +35,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/util/bson_extract.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" diff --git a/src/mongo/db/s/split_chunk.cpp b/src/mongo/db/s/split_chunk.cpp index 1936edb3ff4..ca9da994e73 100644 --- a/src/mongo/db/s/split_chunk.cpp +++ b/src/mongo/db/s/split_chunk.cpp @@ -34,8 +34,8 @@ #include "mongo/base/status_with.h" #include "mongo/bson/util/bson_extract.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/index_catalog.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/commands.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/index/index_descriptor.h" diff --git a/src/mongo/db/s/split_vector.cpp b/src/mongo/db/s/split_vector.cpp index 3e917524aaf..3fd68070786 100644 --- a/src/mongo/db/s/split_vector.cpp +++ b/src/mongo/db/s/split_vector.cpp @@ -34,8 +34,8 @@ #include "mongo/base/status_with.h" #include "mongo/db/bson/dotted_path_support.h" -#include "mongo/db/catalog/catalog_raii.h" #include "mongo/db/catalog/index_catalog.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/exec/working_set_common.h" #include "mongo/db/index/index_descriptor.h" diff --git a/src/mongo/s/client/shard_local_test.cpp b/src/mongo/s/client/shard_local_test.cpp index 2eaabd74703..2e1f46e7384 100644 --- a/src/mongo/s/client/shard_local_test.cpp +++ b/src/mongo/s/client/shard_local_test.cpp @@ -31,7 +31,7 @@ #include "mongo/s/client/shard_local.h" #include "mongo/client/read_preference.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/query/cursor_response.h" #include "mongo/db/query/find_and_modify_request.h" diff --git a/src/mongo/s/config_server_test_fixture.cpp b/src/mongo/s/config_server_test_fixture.cpp index bd0a473426d..4df783c1055 100644 --- a/src/mongo/s/config_server_test_fixture.cpp +++ b/src/mongo/s/config_server_test_fixture.cpp @@ -36,7 +36,7 @@ #include "mongo/base/status_with.h" #include "mongo/client/remote_command_targeter_factory_mock.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/namespace_string.h" diff --git a/src/mongo/s/sharding_mongod_test_fixture.cpp b/src/mongo/s/sharding_mongod_test_fixture.cpp index e4813f6f887..83215c99999 100644 --- a/src/mongo/s/sharding_mongod_test_fixture.cpp +++ b/src/mongo/s/sharding_mongod_test_fixture.cpp @@ -36,7 +36,7 @@ #include "mongo/base/status_with.h" #include "mongo/client/remote_command_targeter_factory_mock.h" #include "mongo/client/remote_command_targeter_mock.h" -#include "mongo/db/catalog/catalog_raii.h" +#include "mongo/db/catalog_raii.h" #include "mongo/db/client.h" #include "mongo/db/commands.h" #include "mongo/db/namespace_string.h" |