diff options
Diffstat (limited to 'src/mongo/db')
100 files changed, 115 insertions, 112 deletions
diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp index 26eb6766f09..fdcb001a229 100644 --- a/src/mongo/db/catalog/coll_mod.cpp +++ b/src/mongo/db/catalog/coll_mod.cpp @@ -55,7 +55,7 @@ #include "mongo/db/storage/durable_catalog.h" #include "mongo/db/storage/recovery_unit.h" #include "mongo/db/views/view_catalog.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/catalog/collection_impl.cpp b/src/mongo/db/catalog/collection_impl.cpp index 61df6557190..520f6d6e9ef 100644 --- a/src/mongo/db/catalog/collection_impl.cpp +++ b/src/mongo/db/catalog/collection_impl.cpp @@ -72,7 +72,7 @@ #include "mongo/db/auth/user_document_parser.h" // XXX-ANDY #include "mongo/rpc/object_check.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/catalog/collection_validation_test.cpp b/src/mongo/db/catalog/collection_validation_test.cpp index 18072161348..85a648b0f51 100644 --- a/src/mongo/db/catalog/collection_validation_test.cpp +++ b/src/mongo/db/catalog/collection_validation_test.cpp @@ -36,7 +36,7 @@ #include "mongo/db/db_raii.h" #include "mongo/stdx/thread.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/catalog/database_impl.cpp b/src/mongo/db/catalog/database_impl.cpp index a072112e7ca..400b5f895c0 100644 --- a/src/mongo/db/catalog/database_impl.cpp +++ b/src/mongo/db/catalog/database_impl.cpp @@ -75,7 +75,7 @@ #include "mongo/platform/random.h" #include "mongo/s/cannot_implicitly_create_collection_info.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/catalog/drop_collection.cpp b/src/mongo/db/catalog/drop_collection.cpp index 5167f4f8383..da14e62084b 100644 --- a/src/mongo/db/catalog/drop_collection.cpp +++ b/src/mongo/db/catalog/drop_collection.cpp @@ -44,7 +44,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/views/view_catalog.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/catalog/drop_database.cpp b/src/mongo/db/catalog/drop_database.cpp index bb3747bfc23..ba78b5d8d24 100644 --- a/src/mongo/db/catalog/drop_database.cpp +++ b/src/mongo/db/catalog/drop_database.cpp @@ -48,7 +48,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/write_concern_options.h" #include "mongo/util/duration.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/catalog/index_key_validate.cpp b/src/mongo/db/catalog/index_key_validate.cpp index 164876fe330..5d46cd319bc 100644 --- a/src/mongo/db/catalog/index_key_validate.cpp +++ b/src/mongo/db/catalog/index_key_validate.cpp @@ -50,7 +50,7 @@ #include "mongo/db/query/collation/collator_factory_interface.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/service_context.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/represent_as.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/catalog/multi_index_block.h b/src/mongo/db/catalog/multi_index_block.h index df940d2121e..2d4d763c91c 100644 --- a/src/mongo/db/catalog/multi_index_block.h +++ b/src/mongo/db/catalog/multi_index_block.h @@ -47,7 +47,7 @@ #include "mongo/db/index/index_access_method.h" #include "mongo/db/record_id.h" #include "mongo/platform/mutex.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp index f79632c3c75..f42bac3e5cb 100644 --- a/src/mongo/db/catalog/rename_collection.cpp +++ b/src/mongo/db/catalog/rename_collection.cpp @@ -57,7 +57,7 @@ #include "mongo/db/service_context.h" #include "mongo/db/storage/durable_catalog.h" #include "mongo/db/views/view_catalog.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/catalog/throttle_cursor.h b/src/mongo/db/catalog/throttle_cursor.h index ba4875fe7ed..2240ee9b58e 100644 --- a/src/mongo/db/catalog/throttle_cursor.h +++ b/src/mongo/db/catalog/throttle_cursor.h @@ -34,7 +34,7 @@ #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/sorted_data_interface.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp index 254694ec1cc..1a207786be2 100644 --- a/src/mongo/db/catalog_raii.cpp +++ b/src/mongo/db/catalog_raii.cpp @@ -35,7 +35,7 @@ #include "mongo/db/catalog/database_holder.h" #include "mongo/db/s/database_sharding_state.h" #include "mongo/db/views/view_catalog.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { namespace { diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp index 16dfcd0cd8f..514097ecc87 100644 --- a/src/mongo/db/cloner.cpp +++ b/src/mongo/db/cloner.cpp @@ -63,7 +63,7 @@ #include "mongo/db/storage/durable_catalog.h" #include "mongo/db/storage/storage_options.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp index f9a08071fae..a9aba5ba218 100644 --- a/src/mongo/db/commands.cpp +++ b/src/mongo/db/commands.cpp @@ -58,7 +58,7 @@ #include "mongo/rpc/protocol.h" #include "mongo/rpc/write_concern_error_detail.h" #include "mongo/s/stale_exception.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/invariant.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/commands.h b/src/mongo/db/commands.h index e944f7c238f..6002af5e03e 100644 --- a/src/mongo/db/commands.h +++ b/src/mongo/db/commands.h @@ -49,7 +49,7 @@ #include "mongo/db/write_concern.h" #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_builder_interface.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/string_map.h" namespace mongo { diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp index 327983b3bd4..3db0141f5a5 100644 --- a/src/mongo/db/commands/dbcommands.cpp +++ b/src/mongo/db/commands/dbcommands.cpp @@ -88,7 +88,7 @@ #include "mongo/db/storage/storage_engine_init.h" #include "mongo/db/write_concern.h" #include "mongo/scripting/engine.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/md5.hpp" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/commands/dbcommands_d.cpp b/src/mongo/db/commands/dbcommands_d.cpp index 71642bec879..63d13351598 100644 --- a/src/mongo/db/commands/dbcommands_d.cpp +++ b/src/mongo/db/commands/dbcommands_d.cpp @@ -88,7 +88,7 @@ #include "mongo/db/write_concern.h" #include "mongo/s/stale_exception.h" #include "mongo/scripting/engine.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/md5.hpp" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/commands/fail_point_cmd.cpp b/src/mongo/db/commands/fail_point_cmd.cpp index a50cc4ff06d..4eb0d3e3a02 100644 --- a/src/mongo/db/commands/fail_point_cmd.cpp +++ b/src/mongo/db/commands/fail_point_cmd.cpp @@ -37,7 +37,7 @@ #include "mongo/db/auth/privilege.h" #include "mongo/db/commands.h" #include "mongo/db/commands/test_commands_enabled.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { @@ -48,19 +48,24 @@ namespace mongo { * Format * { * configureFailPoint: <string>, // name of the fail point. - * mode: <string|Object>, // the new mode to set. Can have one of the - * following format: * - * 1. 'off' - disable fail point. - * 2. 'alwaysOn' - fail point is always active. - * 3. { activationProbability: <n> } - n should be a double between 0 and 1, - * representing the probability that the fail point will fire. 0 means never, - * 1 means (nearly) always. - * 4. { times: <n> } - n should be positive and within the range of a 32 bit - * signed integer and this is the number of passes on the fail point will - * remain activated. + * mode: <string|Object>, // the new mode to set. Can have one of the following format: * - * data: <Object> // optional arbitrary object to store. + * - 'off' - disable fail point. + * + * - 'alwaysOn' - fail point is always active. + * + * - { activationProbability: <n> } - double n. [0 <= n <= 1] + * n: the probability that the fail point will fire. 0=never, 1=always. + * + * - { times: <n> } - int32 n. n > 0. n: # of passes the fail point remains active. + * + * - { skip: <n> } - int32 n. n > 0. n: # of passes before the fail point activates + * and remains active. + * + * data: <Object> // optional arbitrary object to inject into the failpoint. + * When activated, the FailPoint can read this data and it can be used to inform + * the specific action taken by the code under test. * } */ class FaultInjectCmd : public BasicCommand { diff --git a/src/mongo/db/commands/generic_servers.cpp b/src/mongo/db/commands/generic_servers.cpp index 5fe6e5b56e9..d753f010b4c 100644 --- a/src/mongo/db/commands/generic_servers.cpp +++ b/src/mongo/db/commands/generic_servers.cpp @@ -40,7 +40,6 @@ #include "mongo/scripting/engine.h" #include "mongo/util/exit.h" #include "mongo/util/fail_point.h" -#include "mongo/util/fail_point_service.h" #include "mongo/util/log.h" #include "mongo/util/net/socket_utils.h" #include "mongo/util/ntservice.h" diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp index 345ac9f0049..295c8e0553d 100644 --- a/src/mongo/db/commands/getmore_cmd.cpp +++ b/src/mongo/db/commands/getmore_cmd.cpp @@ -58,7 +58,7 @@ #include "mongo/db/stats/counters.h" #include "mongo/db/stats/top.h" #include "mongo/s/chunk_version.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp index cfe59311ab4..6232dc35601 100644 --- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp +++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp @@ -50,7 +50,7 @@ #include "mongo/s/database_version_helpers.h" #include "mongo/s/grid.h" #include "mongo/util/exit.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp index fc2b660b953..35369e9ef7c 100644 --- a/src/mongo/db/commands/validate.cpp +++ b/src/mongo/db/commands/validate.cpp @@ -38,7 +38,7 @@ #include "mongo/db/query/internal_plans.h" #include "mongo/db/storage/durable_catalog.h" #include "mongo/db/storage/record_store.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp index 5f5171e6129..508713b7d02 100644 --- a/src/mongo/db/concurrency/lock_state.cpp +++ b/src/mongo/db/concurrency/lock_state.cpp @@ -44,7 +44,7 @@ #include "mongo/util/background.h" #include "mongo/util/concurrency/ticketholder.h" #include "mongo/util/debug_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/concurrency/lock_state_test.cpp b/src/mongo/db/concurrency/lock_state_test.cpp index f32068aa74b..81a6f59968a 100644 --- a/src/mongo/db/concurrency/lock_state_test.cpp +++ b/src/mongo/db/concurrency/lock_state_test.cpp @@ -40,7 +40,7 @@ #include "mongo/db/concurrency/locker.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/timer.h" diff --git a/src/mongo/db/concurrency/write_conflict_exception.h b/src/mongo/db/concurrency/write_conflict_exception.h index 84089ae86f6..57455d4b12f 100644 --- a/src/mongo/db/concurrency/write_conflict_exception.h +++ b/src/mongo/db/concurrency/write_conflict_exception.h @@ -34,7 +34,7 @@ #include "mongo/base/string_data.h" #include "mongo/db/curop.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/curop_failpoint_helpers.h b/src/mongo/db/curop_failpoint_helpers.h index 8e2bd1bc08f..a88bbc67e30 100644 --- a/src/mongo/db/curop_failpoint_helpers.h +++ b/src/mongo/db/curop_failpoint_helpers.h @@ -29,7 +29,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/operation_context.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { @@ -42,7 +42,7 @@ public: static std::string updateCurOpMsg(OperationContext* opCtx, const std::string& newMsg); /** - * This helper function works much like MONGO_FAIL_POINT_PAUSE_WHILE_SET, but additionally + * This helper function works much like FailPoint::pauseWhileSet(opCtx), but additionally * calls whileWaiting() at regular intervals. Finally, it also sets the 'msg' field of the * opCtx's CurOp to the given string while the failpoint is active. * diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index 2b84068ac50..2dc91c831d8 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -164,7 +164,7 @@ #include "mongo/util/concurrency/thread_name.h" #include "mongo/util/exception_filter_win32.h" #include "mongo/util/exit.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/fast_clock_source_factory.h" #include "mongo/util/log.h" #include "mongo/util/net/socket_utils.h" diff --git a/src/mongo/db/exec/collection_scan.cpp b/src/mongo/db/exec/collection_scan.cpp index 48ace4d7261..f53cf16e4af 100644 --- a/src/mongo/db/exec/collection_scan.cpp +++ b/src/mongo/db/exec/collection_scan.cpp @@ -43,7 +43,7 @@ #include "mongo/db/exec/working_set_common.h" #include "mongo/db/repl/optime.h" #include "mongo/db/storage/oplog_hack.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/db/client.h" // XXX-ERH diff --git a/src/mongo/db/exec/fetch.cpp b/src/mongo/db/exec/fetch.cpp index bb09866f983..6e9eb4fbeb6 100644 --- a/src/mongo/db/exec/fetch.cpp +++ b/src/mongo/db/exec/fetch.cpp @@ -38,7 +38,7 @@ #include "mongo/db/exec/filter.h" #include "mongo/db/exec/scoped_timer.h" #include "mongo/db/exec/working_set_common.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/db/index/index_build_interceptor.cpp b/src/mongo/db/index/index_build_interceptor.cpp index e8b88e91d1f..00d7b9e444e 100644 --- a/src/mongo/db/index/index_build_interceptor.cpp +++ b/src/mongo/db/index/index_build_interceptor.cpp @@ -46,7 +46,7 @@ #include "mongo/db/multi_key_path_tracker.h" #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/progress_meter.h" #include "mongo/util/uuid.h" diff --git a/src/mongo/db/index_builds_coordinator.h b/src/mongo/db/index_builds_coordinator.h index 832c85ee652..1eb709b48d1 100644 --- a/src/mongo/db/index_builds_coordinator.h +++ b/src/mongo/db/index_builds_coordinator.h @@ -46,7 +46,7 @@ #include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" #include "mongo/util/concurrency/with_lock.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/future.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/key_generator.cpp b/src/mongo/db/key_generator.cpp index def0b6c4ac5..7c95d210bfa 100644 --- a/src/mongo/db/key_generator.cpp +++ b/src/mongo/db/key_generator.cpp @@ -36,7 +36,7 @@ #include "mongo/db/logical_clock.h" #include "mongo/db/operation_context.h" #include "mongo/s/client/shard_registry.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/key_generator_update_test.cpp b/src/mongo/db/key_generator_update_test.cpp index bcfc2942bdd..885d7dfe25b 100644 --- a/src/mongo/db/key_generator_update_test.cpp +++ b/src/mongo/db/key_generator_update_test.cpp @@ -42,7 +42,7 @@ #include "mongo/s/config_server_test_fixture.h" #include "mongo/unittest/unittest.h" #include "mongo/util/clock_source_mock.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { namespace { diff --git a/src/mongo/db/keys_collection_manager.cpp b/src/mongo/db/keys_collection_manager.cpp index 155c52b163c..c96af99f13d 100644 --- a/src/mongo/db/keys_collection_manager.cpp +++ b/src/mongo/db/keys_collection_manager.cpp @@ -42,7 +42,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/service_context.h" #include "mongo/util/concurrency/idle_thread_block.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/keys_collection_manager_sharding_test.cpp b/src/mongo/db/keys_collection_manager_sharding_test.cpp index d7d96d15d14..f6d4fc53a97 100644 --- a/src/mongo/db/keys_collection_manager_sharding_test.cpp +++ b/src/mongo/db/keys_collection_manager_sharding_test.cpp @@ -42,7 +42,7 @@ #include "mongo/s/config_server_test_fixture.h" #include "mongo/unittest/unittest.h" #include "mongo/util/clock_source_mock.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { namespace { diff --git a/src/mongo/db/matcher/expression.h b/src/mongo/db/matcher/expression.h index b476db91330..a7aa51b7d33 100644 --- a/src/mongo/db/matcher/expression.h +++ b/src/mongo/db/matcher/expression.h @@ -38,7 +38,7 @@ #include "mongo/db/matcher/match_details.h" #include "mongo/db/matcher/matchable.h" #include "mongo/db/pipeline/dependencies.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/matcher/expression_expr.cpp b/src/mongo/db/matcher/expression_expr.cpp index 62a345ab515..bce9461a50f 100644 --- a/src/mongo/db/matcher/expression_expr.cpp +++ b/src/mongo/db/matcher/expression_expr.cpp @@ -31,7 +31,7 @@ #include "mongo/db/matcher/expression_expr.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/op_observer_impl.cpp b/src/mongo/db/op_observer_impl.cpp index 0c789bb301c..73d31fd799d 100644 --- a/src/mongo/db/op_observer_impl.cpp +++ b/src/mongo/db/op_observer_impl.cpp @@ -61,7 +61,7 @@ #include "mongo/s/grid.h" #include "mongo/scripting/engine.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { using repl::MutableOplogEntry; diff --git a/src/mongo/db/operation_context.cpp b/src/mongo/db/operation_context.cpp index c471c870fe1..bab631ad351 100644 --- a/src/mongo/db/operation_context.cpp +++ b/src/mongo/db/operation_context.cpp @@ -40,7 +40,7 @@ #include "mongo/transport/baton.h" #include "mongo/util/assert_util.h" #include "mongo/util/clock_source.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/system_tick_source.h" diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp index a495ab7a429..d640bbf8113 100644 --- a/src/mongo/db/ops/write_ops_exec.cpp +++ b/src/mongo/db/ops/write_ops_exec.cpp @@ -77,7 +77,7 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/cannot_implicitly_create_collection_info.h" #include "mongo/s/would_change_owning_shard_exception.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/log_and_backoff.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/pipeline/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp index 2d5f131d190..eb01db2a2ad 100644 --- a/src/mongo/db/pipeline/document_source_cursor.cpp +++ b/src/mongo/db/pipeline/document_source_cursor.cpp @@ -40,7 +40,7 @@ #include "mongo/db/query/explain.h" #include "mongo/db/query/find_common.h" #include "mongo/db/storage/storage_options.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/pipeline/pipeline.cpp b/src/mongo/db/pipeline/pipeline.cpp index 81c9ee10b6b..7642b1ef49a 100644 --- a/src/mongo/db/pipeline/pipeline.cpp +++ b/src/mongo/db/pipeline/pipeline.cpp @@ -50,7 +50,7 @@ #include "mongo/db/pipeline/document_source_unwind.h" #include "mongo/db/pipeline/expression.h" #include "mongo/db/pipeline/expression_context.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/str.h" namespace mongo { diff --git a/src/mongo/db/query/find.cpp b/src/mongo/db/query/find.cpp index 8cc25ffea1c..bf2d41c52a8 100644 --- a/src/mongo/db/query/find.cpp +++ b/src/mongo/db/query/find.cpp @@ -65,7 +65,7 @@ #include "mongo/db/views/view_catalog.h" #include "mongo/s/chunk_version.h" #include "mongo/s/stale_exception.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/query/find_common.h b/src/mongo/db/query/find_common.h index 31c6b010692..a0a4f747cda 100644 --- a/src/mongo/db/query/find_common.h +++ b/src/mongo/db/query/find_common.h @@ -29,7 +29,7 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/operation_context.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/query/plan_executor_impl.cpp b/src/mongo/db/query/plan_executor_impl.cpp index d8c964f842d..3d0629d5d30 100644 --- a/src/mongo/db/query/plan_executor_impl.cpp +++ b/src/mongo/db/query/plan_executor_impl.cpp @@ -56,7 +56,7 @@ #include "mongo/db/query/plan_yield_policy.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/service_context.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/stacktrace.h" diff --git a/src/mongo/db/query/plan_yield_policy.cpp b/src/mongo/db/query/plan_yield_policy.cpp index 3200f343239..856d15c8b4c 100644 --- a/src/mongo/db/query/plan_yield_policy.cpp +++ b/src/mongo/db/query/plan_yield_policy.cpp @@ -37,7 +37,7 @@ #include "mongo/db/operation_context.h" #include "mongo/db/query/query_knobs_gen.h" #include "mongo/db/service_context.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/scopeguard.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp index 34f241999b0..fdc1d412f6d 100644 --- a/src/mongo/db/repl/apply_ops.cpp +++ b/src/mongo/db/repl/apply_ops.cpp @@ -56,7 +56,7 @@ #include "mongo/db/session_catalog_mongod.h" #include "mongo/db/transaction_participant.h" #include "mongo/rpc/get_status_from_command_result.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/repl/collection_cloner.cpp b/src/mongo/db/repl/collection_cloner.cpp index 62f601affd9..ee1d25accbb 100644 --- a/src/mongo/db/repl/collection_cloner.cpp +++ b/src/mongo/db/repl/collection_cloner.cpp @@ -49,7 +49,7 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/util/assert_util.h" #include "mongo/util/destructor_guard.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/database_cloner.cpp b/src/mongo/db/repl/database_cloner.cpp index 55eab0a0aa4..e8f7b1d7302 100644 --- a/src/mongo/db/repl/database_cloner.cpp +++ b/src/mongo/db/repl/database_cloner.cpp @@ -45,7 +45,7 @@ #include "mongo/db/repl/storage_interface.h" #include "mongo/util/assert_util.h" #include "mongo/util/destructor_guard.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/initial_syncer.cpp b/src/mongo/db/repl/initial_syncer.cpp index 8f19951e265..3f75689ff10 100644 --- a/src/mongo/db/repl/initial_syncer.cpp +++ b/src/mongo/db/repl/initial_syncer.cpp @@ -66,7 +66,7 @@ #include "mongo/rpc/metadata/repl_set_metadata.h" #include "mongo/util/assert_util.h" #include "mongo/util/destructor_guard.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/initial_syncer.h b/src/mongo/db/repl/initial_syncer.h index adc891bc5d1..da12c4027be 100644 --- a/src/mongo/db/repl/initial_syncer.h +++ b/src/mongo/db/repl/initial_syncer.h @@ -55,7 +55,7 @@ #include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" #include "mongo/util/concurrency/thread_pool.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/net/hostandport.h" namespace mongo { diff --git a/src/mongo/db/repl/initial_syncer_test.cpp b/src/mongo/db/repl/initial_syncer_test.cpp index 4a6a9176ac7..e1fb7d7fd48 100644 --- a/src/mongo/db/repl/initial_syncer_test.cpp +++ b/src/mongo/db/repl/initial_syncer_test.cpp @@ -63,7 +63,7 @@ #include "mongo/platform/mutex.h" #include "mongo/util/concurrency/thread_name.h" #include "mongo/util/concurrency/thread_pool.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index edacd2c9940..3d356c7ab70 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -94,7 +94,7 @@ #include "mongo/scripting/engine.h" #include "mongo/util/concurrency/idle_thread_block.h" #include "mongo/util/elapsed_tracker.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/file.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/repl/oplog_applier_impl.cpp b/src/mongo/db/repl/oplog_applier_impl.cpp index 3a36fb4dba9..5f9e9a5093d 100644 --- a/src/mongo/db/repl/oplog_applier_impl.cpp +++ b/src/mongo/db/repl/oplog_applier_impl.cpp @@ -46,7 +46,7 @@ #include "mongo/db/repl/transaction_oplog_application.h" #include "mongo/db/stats/timer_stats.h" #include "mongo/platform/basic.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "third_party/murmurhash3/MurmurHash3.h" diff --git a/src/mongo/db/repl/oplog_fetcher.cpp b/src/mongo/db/repl/oplog_fetcher.cpp index d38f05bae8e..514de02e8c8 100644 --- a/src/mongo/db/repl/oplog_fetcher.cpp +++ b/src/mongo/db/repl/oplog_fetcher.cpp @@ -41,7 +41,7 @@ #include "mongo/db/stats/timer_stats.h" #include "mongo/rpc/metadata/oplog_query_metadata.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repl/oplog_fetcher.h b/src/mongo/db/repl/oplog_fetcher.h index 6bf7a0275eb..635732e8d85 100644 --- a/src/mongo/db/repl/oplog_fetcher.h +++ b/src/mongo/db/repl/oplog_fetcher.h @@ -39,7 +39,7 @@ #include "mongo/db/repl/abstract_oplog_fetcher.h" #include "mongo/db/repl/data_replicator_external_state.h" #include "mongo/db/repl/repl_set_config.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { namespace repl { diff --git a/src/mongo/db/repl/repl_set_commands.cpp b/src/mongo/db/repl/repl_set_commands.cpp index cadbce56e30..ee1f49396a1 100644 --- a/src/mongo/db/repl/repl_set_commands.cpp +++ b/src/mongo/db/repl/repl_set_commands.cpp @@ -64,7 +64,7 @@ #include "mongo/transport/session.h" #include "mongo/transport/transport_layer.h" #include "mongo/util/decimal_counter.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/net/socket_utils.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp index 02cc3557a96..1c7603ca075 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp @@ -101,7 +101,7 @@ #include "mongo/util/assert_util.h" #include "mongo/util/concurrency/thread_pool.h" #include "mongo/util/exit.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 90a7900bd4f..b049f42537b 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -86,7 +86,7 @@ #include "mongo/rpc/metadata/oplog_query_metadata.h" #include "mongo/rpc/metadata/repl_set_metadata.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/stacktrace.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp index 2f9344f44f9..3efb852080a 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_elect_v1_test.cpp @@ -45,7 +45,7 @@ #include "mongo/db/repl/topology_coordinator.h" #include "mongo/executor/network_interface_mock.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include <boost/optional/optional_io.hpp> diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp index 5670e767a90..4f97dce7ebe 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp @@ -58,7 +58,7 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/rpc/metadata/repl_set_metadata.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp index e90146ecf34..276148da179 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_reconfig_test.cpp @@ -42,7 +42,7 @@ #include "mongo/db/repl/replication_coordinator_test_fixture.h" #include "mongo/executor/network_interface_mock.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/repl/replication_coordinator_test_fixture.cpp b/src/mongo/db/repl/replication_coordinator_test_fixture.cpp index 27fac4a3715..d09d8bdf379 100644 --- a/src/mongo/db/repl/replication_coordinator_test_fixture.cpp +++ b/src/mongo/db/repl/replication_coordinator_test_fixture.cpp @@ -53,7 +53,7 @@ #include "mongo/executor/thread_pool_mock.h" #include "mongo/executor/thread_pool_task_executor.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/repl/replication_info.cpp b/src/mongo/db/repl/replication_info.cpp index 9b854735676..4c784d7648e 100644 --- a/src/mongo/db/repl/replication_info.cpp +++ b/src/mongo/db/repl/replication_info.cpp @@ -59,7 +59,7 @@ #include "mongo/rpc/metadata/client_metadata.h" #include "mongo/rpc/metadata/client_metadata_ismaster.h" #include "mongo/util/decimal_counter.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/map_util.h" diff --git a/src/mongo/db/repl/roll_back_local_operations.h b/src/mongo/db/repl/roll_back_local_operations.h index b6920cc10c4..a693deadec7 100644 --- a/src/mongo/db/repl/roll_back_local_operations.h +++ b/src/mongo/db/repl/roll_back_local_operations.h @@ -38,7 +38,7 @@ #include "mongo/db/repl/oplog_entry.h" #include "mongo/db/repl/oplog_interface.h" #include "mongo/db/repl/optime.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { namespace repl { diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp index fa918ba6b46..255dedd9995 100644 --- a/src/mongo/db/repl/rs_rollback.cpp +++ b/src/mongo/db/repl/rs_rollback.cpp @@ -77,7 +77,7 @@ #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" #include "mongo/util/exit.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/repl/storage_interface_impl_test.cpp b/src/mongo/db/repl/storage_interface_impl_test.cpp index 378248e5316..aa3a3fa0b46 100644 --- a/src/mongo/db/repl/storage_interface_impl_test.cpp +++ b/src/mongo/db/repl/storage_interface_impl_test.cpp @@ -55,7 +55,7 @@ #include "mongo/stdx/thread.h" #include "mongo/unittest/unittest.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/str.h" namespace { diff --git a/src/mongo/db/repl/topology_coordinator.cpp b/src/mongo/db/repl/topology_coordinator.cpp index 77da01a202d..49c099f84a9 100644 --- a/src/mongo/db/repl/topology_coordinator.cpp +++ b/src/mongo/db/repl/topology_coordinator.cpp @@ -54,7 +54,7 @@ #include "mongo/rpc/metadata/oplog_query_metadata.h" #include "mongo/rpc/metadata/repl_set_metadata.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/hex.h" #include "mongo/util/log.h" #include "mongo/util/net/socket_utils.h" diff --git a/src/mongo/db/s/balancer/balancer.cpp b/src/mongo/db/s/balancer/balancer.cpp index 9a2fadb8327..0f1f30a89dc 100644 --- a/src/mongo/db/s/balancer/balancer.cpp +++ b/src/mongo/db/s/balancer/balancer.cpp @@ -54,7 +54,7 @@ #include "mongo/s/shard_util.h" #include "mongo/util/concurrency/idle_thread_block.h" #include "mongo/util/exit.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/timer.h" #include "mongo/util/version.h" diff --git a/src/mongo/db/s/balancer/balancer_policy.cpp b/src/mongo/db/s/balancer/balancer_policy.cpp index f512f77ca6a..6b3fb9d78ba 100644 --- a/src/mongo/db/s/balancer/balancer_policy.cpp +++ b/src/mongo/db/s/balancer/balancer_policy.cpp @@ -38,7 +38,7 @@ #include "mongo/db/s/balancer/type_migration.h" #include "mongo/s/catalog/type_shard.h" #include "mongo/s/catalog/type_tags.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/s/collection_sharding_state.cpp b/src/mongo/db/s/collection_sharding_state.cpp index 687c9a877b1..5fc2a88d16a 100644 --- a/src/mongo/db/s/collection_sharding_state.cpp +++ b/src/mongo/db/s/collection_sharding_state.cpp @@ -37,7 +37,7 @@ #include "mongo/db/s/operation_sharding_state.h" #include "mongo/db/s/sharded_connection_info.h" #include "mongo/s/stale_exception.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/string_map.h" diff --git a/src/mongo/db/s/config/configsvr_drop_collection_command.cpp b/src/mongo/db/s/config/configsvr_drop_collection_command.cpp index 06970e7ecf3..24717899952 100644 --- a/src/mongo/db/s/config/configsvr_drop_collection_command.cpp +++ b/src/mongo/db/s/config/configsvr_drop_collection_command.cpp @@ -44,7 +44,7 @@ #include "mongo/s/cluster_commands_helpers.h" #include "mongo/s/grid.h" #include "mongo/s/stale_exception.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp index 00287e86410..577240cb5f8 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp @@ -53,7 +53,7 @@ #include "mongo/s/config_server_test_fixture.h" #include "mongo/s/database_version_helpers.h" #include "mongo/s/write_ops/batched_command_response.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.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 461ab7fd2bf..82f6cad21af 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 @@ -50,7 +50,7 @@ #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" #include "mongo/s/shard_key_pattern.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp index 28122a3a3da..3bdf40442f0 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp @@ -72,7 +72,7 @@ #include "mongo/s/write_ops/batched_command_request.h" #include "mongo/s/write_ops/batched_command_response.h" #include "mongo/transport/service_entry_point.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.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 14781634e42..4e737b23027 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 @@ -74,7 +74,7 @@ #include "mongo/s/shard_util.h" #include "mongo/s/write_ops/batched_command_request.h" #include "mongo/s/write_ops/batched_command_response.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/s/database_sharding_state.cpp b/src/mongo/db/s/database_sharding_state.cpp index 643c36d9dcd..9580cf6026a 100644 --- a/src/mongo/db/s/database_sharding_state.cpp +++ b/src/mongo/db/s/database_sharding_state.cpp @@ -37,7 +37,7 @@ #include "mongo/db/s/operation_sharding_state.h" #include "mongo/s/database_version_helpers.h" #include "mongo/s/stale_exception.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/s/metadata_manager.cpp b/src/mongo/db/s/metadata_manager.cpp index 52f606b4031..5c710c48603 100644 --- a/src/mongo/db/s/metadata_manager.cpp +++ b/src/mongo/db/s/metadata_manager.cpp @@ -43,7 +43,7 @@ #include "mongo/db/s/collection_sharding_state.h" #include "mongo/s/grid.h" #include "mongo/util/assert_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp index 946e6575468..eee35a80cca 100644 --- a/src/mongo/db/s/migration_destination_manager.cpp +++ b/src/mongo/db/s/migration_destination_manager.cpp @@ -64,7 +64,7 @@ #include "mongo/s/shard_key_pattern.h" #include "mongo/stdx/chrono.h" #include "mongo/util/concurrency/notification.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/producer_consumer_queue.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index 56d84023c24..f8e9d15e96b 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -63,7 +63,7 @@ #include "mongo/util/duration.h" #include "mongo/util/elapsed_tracker.h" #include "mongo/util/exit.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/s/move_chunk_command.cpp b/src/mongo/db/s/move_chunk_command.cpp index 24c0023a6c4..8afc52f0a7f 100644 --- a/src/mongo/db/s/move_chunk_command.cpp +++ b/src/mongo/db/s/move_chunk_command.cpp @@ -48,7 +48,7 @@ #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/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp index 9042fba9b5d..5926ddcb456 100644 --- a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp +++ b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp @@ -44,7 +44,7 @@ #include "mongo/db/s/sharding_statistics.h" #include "mongo/s/catalog_cache.h" #include "mongo/s/grid.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp index a974104d1f4..ee2230b6333 100644 --- a/src/mongo/db/s/shard_server_catalog_cache_loader.cpp +++ b/src/mongo/db/s/shard_server_catalog_cache_loader.cpp @@ -46,7 +46,7 @@ #include "mongo/s/catalog/type_shard_database.h" #include "mongo/s/client/shard_registry.h" #include "mongo/s/grid.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/s/transaction_coordinator.cpp b/src/mongo/db/s/transaction_coordinator.cpp index 3d3e392980a..9393168a86b 100644 --- a/src/mongo/db/s/transaction_coordinator.cpp +++ b/src/mongo/db/s/transaction_coordinator.cpp @@ -38,7 +38,7 @@ #include "mongo/db/s/wait_for_majority_service.h" #include "mongo/db/server_options.h" #include "mongo/s/grid.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/s/transaction_coordinator.h b/src/mongo/db/s/transaction_coordinator.h index 68745a3e540..c01b4133cf8 100644 --- a/src/mongo/db/s/transaction_coordinator.h +++ b/src/mongo/db/s/transaction_coordinator.h @@ -32,7 +32,7 @@ #include <vector> #include "mongo/db/s/transaction_coordinator_util.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/s/transaction_coordinator_futures_util.cpp b/src/mongo/db/s/transaction_coordinator_futures_util.cpp index 05061af7fbe..5f19b0eeb46 100644 --- a/src/mongo/db/s/transaction_coordinator_futures_util.cpp +++ b/src/mongo/db/s/transaction_coordinator_futures_util.cpp @@ -39,7 +39,7 @@ #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/grid.h" #include "mongo/transport/service_entry_point.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/s/transaction_coordinator_util.cpp b/src/mongo/db/s/transaction_coordinator_util.cpp index c98a1c25775..7d98befd9d2 100644 --- a/src/mongo/db/s/transaction_coordinator_util.cpp +++ b/src/mongo/db/s/transaction_coordinator_util.cpp @@ -44,7 +44,7 @@ #include "mongo/db/s/transaction_coordinator_worker_curop_repository.h" #include "mongo/db/write_concern.h" #include "mongo/rpc/get_status_from_command_result.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp index a9d4badc2c6..9ff88f5c9ef 100644 --- a/src/mongo/db/server_options_helpers.cpp +++ b/src/mongo/db/server_options_helpers.cpp @@ -51,7 +51,7 @@ #include "mongo/logger/message_event_utf8_encoder.h" #include "mongo/transport/message_compressor_registry.h" #include "mongo/util/cmdline_utils/censor_cmdline.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/map_util.h" #include "mongo/util/net/sock.h" diff --git a/src/mongo/db/server_options_server_helpers.cpp b/src/mongo/db/server_options_server_helpers.cpp index 0dfe6e1f78a..4cf1a4164da 100644 --- a/src/mongo/db/server_options_server_helpers.cpp +++ b/src/mongo/db/server_options_server_helpers.cpp @@ -50,7 +50,7 @@ #include "mongo/logger/message_event_utf8_encoder.h" #include "mongo/transport/message_compressor_registry.h" #include "mongo/util/cmdline_utils/censor_cmdline.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/map_util.h" #include "mongo/util/net/sock.h" diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp index 1f38b66d6d9..182509fa32a 100644 --- a/src/mongo/db/service_entry_point_common.cpp +++ b/src/mongo/db/service_entry_point_common.cpp @@ -90,7 +90,7 @@ #include "mongo/rpc/metadata/tracking_metadata.h" #include "mongo/rpc/op_msg.h" #include "mongo/rpc/reply_builder_interface.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/scopeguard.h" diff --git a/src/mongo/db/service_entry_point_common.h b/src/mongo/db/service_entry_point_common.h index b41c0ef2c55..2fa1412c3b2 100644 --- a/src/mongo/db/service_entry_point_common.h +++ b/src/mongo/db/service_entry_point_common.h @@ -34,7 +34,7 @@ #include "mongo/db/dbmessage.h" #include "mongo/db/operation_context.h" #include "mongo/rpc/message.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/polymorphic_scoped.h" namespace mongo { diff --git a/src/mongo/db/snapshot_window_util.cpp b/src/mongo/db/snapshot_window_util.cpp index c06bb078d5e..eaf8f9f45cc 100644 --- a/src/mongo/db/snapshot_window_util.cpp +++ b/src/mongo/db/snapshot_window_util.cpp @@ -40,7 +40,7 @@ #include "mongo/db/storage/storage_engine.h" #include "mongo/platform/mutex.h" #include "mongo/util/concurrency/with_lock.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/storage/flow_control.cpp b/src/mongo/db/storage/flow_control.cpp index c6976fd77b2..cf804c25971 100644 --- a/src/mongo/db/storage/flow_control.cpp +++ b/src/mongo/db/storage/flow_control.cpp @@ -45,7 +45,7 @@ #include "mongo/db/server_options.h" #include "mongo/db/storage/flow_control_parameters_gen.h" #include "mongo/util/background.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.cpp index 4cb08f0aa03..c5533e62edd 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.cpp @@ -33,7 +33,7 @@ #include "mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.h b/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.h index 8ce0a079bd4..3b9cb06044a 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.h +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_prepare_conflict.h @@ -33,7 +33,7 @@ #include "mongo/db/prepare_conflict_tracker.h" #include "mongo/db/storage/wiredtiger/wiredtiger_record_store.h" #include "mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" namespace mongo { diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h index 99c0b70fb78..cf82a514969 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.h @@ -46,7 +46,7 @@ #include "mongo/platform/condition_variable.h" #include "mongo/platform/mutex.h" #include "mongo/stdx/thread.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" /** * Either executes the specified operation and returns it's value or randomly throws a write diff --git a/src/mongo/db/storage/write_unit_of_work.cpp b/src/mongo/db/storage/write_unit_of_work.cpp index 8bddf4e9c59..f09cd50cd24 100644 --- a/src/mongo/db/storage/write_unit_of_work.cpp +++ b/src/mongo/db/storage/write_unit_of_work.cpp @@ -33,7 +33,6 @@ #include "mongo/db/operation_context.h" #include "mongo/util/fail_point.h" -#include "mongo/util/fail_point_service.h" #include "mongo/util/time_support.h" namespace mongo { diff --git a/src/mongo/db/transaction_participant.cpp b/src/mongo/db/transaction_participant.cpp index 7e1a2cec1e8..65613550dc8 100644 --- a/src/mongo/db/transaction_participant.cpp +++ b/src/mongo/db/transaction_participant.cpp @@ -63,7 +63,7 @@ #include "mongo/db/stats/fill_locker_info.h" #include "mongo/db/transaction_history_iterator.h" #include "mongo/db/transaction_participant_gen.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" #include "mongo/util/net/socket_utils.h" diff --git a/src/mongo/db/transaction_participant_test.cpp b/src/mongo/db/transaction_participant_test.cpp index 65e94f4355b..3dca2998ae5 100644 --- a/src/mongo/db/transaction_participant_test.cpp +++ b/src/mongo/db/transaction_participant_test.cpp @@ -56,7 +56,7 @@ #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" #include "mongo/util/clock_source_mock.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/net/socket_utils.h" #include "mongo/util/tick_source_mock.h" diff --git a/src/mongo/db/views/view_catalog.cpp b/src/mongo/db/views/view_catalog.cpp index ef49919f3e0..86e1eb7dd2e 100644 --- a/src/mongo/db/views/view_catalog.cpp +++ b/src/mongo/db/views/view_catalog.cpp @@ -55,7 +55,7 @@ #include "mongo/db/views/resolved_view.h" #include "mongo/db/views/view.h" #include "mongo/db/views/view_graph.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp index 70b9e22dbb3..8f05f50e370 100644 --- a/src/mongo/db/write_concern.cpp +++ b/src/mongo/db/write_concern.cpp @@ -46,7 +46,7 @@ #include "mongo/db/storage/storage_engine.h" #include "mongo/db/write_concern_options.h" #include "mongo/rpc/protocol.h" -#include "mongo/util/fail_point_service.h" +#include "mongo/util/fail_point.h" #include "mongo/util/log.h" namespace mongo { |