diff options
| author | Andy Schwerin <Andy Schwerin schwerin@mongodb.com> | 2017-04-07 14:59:54 -0400 |
|---|---|---|
| committer | Andy Schwerin <Andy Schwerin schwerin@mongodb.com> | 2017-04-10 16:12:58 -0400 |
| commit | 3dfb9f67d20188042ce019d2720593935da27b33 (patch) | |
| tree | 0676b435067e1f9195038574441a5755dfd26676 /src/mongo/db/repl/replication_coordinator_impl_elect_test.cpp | |
| parent | 61339fc6cf60938cbc83fd5b6772b10da55d4289 (diff) | |
| download | mongo-3dfb9f67d20188042ce019d2720593935da27b33.tar.gz | |
SERVER-28719 Use a rescheduling fail point instead of blocking on a condition variable in some unit tests.
Diffstat (limited to 'src/mongo/db/repl/replication_coordinator_impl_elect_test.cpp')
| -rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl_elect_test.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_impl_elect_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_elect_test.cpp index 5724fb43bf6..e0ba997c564 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_elect_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_elect_test.cpp @@ -42,6 +42,7 @@ #include "mongo/db/repl/topology_coordinator_impl.h" #include "mongo/executor/network_interface_mock.h" #include "mongo/unittest/unittest.h" +#include "mongo/util/fail_point_service.h" #include "mongo/util/log.h" namespace mongo { @@ -383,8 +384,9 @@ TEST_F(ReplCoordElectTest, NodeWillNotStandForElectionDuringHeartbeatReconfig) { ASSERT(getReplCoord()->setFollowerMode(MemberState::RS_SECONDARY)); getReplCoord()->setMyLastAppliedOpTime(OpTime(Timestamp(100, 0), 0)); - // set hbreconfig to hang while in progress - getExternalState()->setStoreLocalConfigDocumentToHang(true); + getGlobalFailPointRegistry() + ->getFailPoint("blockHeartbeatReconfigFinish") + ->setMode(FailPoint::alwaysOn); // hb reconfig NetworkInterfaceMock* net = getNet(); @@ -455,7 +457,9 @@ TEST_F(ReplCoordElectTest, NodeWillNotStandForElectionDuringHeartbeatReconfig) { ASSERT_EQUALS(1, countLogLinesContaining("Not standing for election; processing " "a configuration change")); - getExternalState()->setStoreLocalConfigDocumentToHang(false); + getGlobalFailPointRegistry() + ->getFailPoint("blockHeartbeatReconfigFinish") + ->setMode(FailPoint::off); } TEST_F(ReplCoordElectTest, StepsDownRemoteIfNodeHasHigherPriorityThanCurrentPrimary) { |