diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2019-09-10 19:03:36 +0000 |
---|---|---|
committer | evergreen <evergreen@mongodb.com> | 2019-09-10 19:03:36 +0000 |
commit | 5a0f718e1309a4484580d8038016d043ef3b887f (patch) | |
tree | 7a331d57ba6e33e61f96ed69b2aa387003a039ab /src/mongo/client/replica_set_monitor.cpp | |
parent | b9e29cd56ebc9aca06f68eeeda7c523d3dfd6d41 (diff) | |
download | mongo-5a0f718e1309a4484580d8038016d043ef3b887f.tar.gz |
SERVER-43119 FailPoint cleanup
- Don't use MONGO_INITIALIZER to declare each fail point.
We only need one init task in total: freeze and iterate the registry.
- remove MONGO_FAIL_POINT_DECLARE macro (extern)
- remove MONGO_FAIL_POINT_SHOULD_FAIL macro (FailPoint::shouldFail)
- remove MONGO_FAIL_POINT_BLOCK_IF (FailPoint::executeIf)
- remove MONGO_FAIL_POINT_BLOCK (FailPoint::execute)
- clean up FailPointRegistry and fail_point_service implementation.
Diffstat (limited to 'src/mongo/client/replica_set_monitor.cpp')
-rw-r--r-- | src/mongo/client/replica_set_monitor.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mongo/client/replica_set_monitor.cpp b/src/mongo/client/replica_set_monitor.cpp index 77d0788466a..fd79717719c 100644 --- a/src/mongo/client/replica_set_monitor.cpp +++ b/src/mongo/client/replica_set_monitor.cpp @@ -180,13 +180,12 @@ const Seconds ReplicaSetMonitor::kDefaultFindHostTimeout(15); bool ReplicaSetMonitor::useDeterministicHostSelection = false; Seconds ReplicaSetMonitor::getDefaultRefreshPeriod() { - MONGO_FAIL_POINT_BLOCK_IF(modifyReplicaSetMonitorDefaultRefreshPeriod, - data, - [&](const BSONObj& data) { return data.hasField("period"); }) { - return Seconds{data.getData().getIntField("period")}; - } - - return kDefaultRefreshPeriod; + Seconds r = kDefaultRefreshPeriod; + static constexpr auto kPeriodField = "period"_sd; + modifyReplicaSetMonitorDefaultRefreshPeriod.executeIf( + [&r](const BSONObj& data) { r = Seconds{data.getIntField(kPeriodField)}; }, + [](const BSONObj& data) { return data.hasField(kPeriodField); }); + return r; } ReplicaSetMonitor::ReplicaSetMonitor(const SetStatePtr& initialState) : _state(initialState) {} |