diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2014-09-12 18:27:38 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2014-09-15 19:08:14 -0400 |
| commit | f082e861661501755b27eee6abf3a4e61e61fdc4 (patch) | |
| tree | 6fb54bea6c1d4eadae487fcab16f1e3dd4c6f4f2 /src/mongo/db/repl/check_quorum_for_config_change_test.cpp | |
| parent | fac5571f67e23a1339e20e0621bab0ba2a6b7163 (diff) | |
| download | mongo-f082e861661501755b27eee6abf3a4e61e61fdc4.tar.gz | |
SERVER-15248 Convert QuorumChecker into a ScatterGatherAlgorithm.
Diffstat (limited to 'src/mongo/db/repl/check_quorum_for_config_change_test.cpp')
| -rw-r--r-- | src/mongo/db/repl/check_quorum_for_config_change_test.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mongo/db/repl/check_quorum_for_config_change_test.cpp b/src/mongo/db/repl/check_quorum_for_config_change_test.cpp index 802f569661d..be1b962c7ae 100644 --- a/src/mongo/db/repl/check_quorum_for_config_change_test.cpp +++ b/src/mongo/db/repl/check_quorum_for_config_change_test.cpp @@ -35,6 +35,7 @@ #include "mongo/db/jsobj.h" #include "mongo/db/repl/check_quorum_for_config_change.h" #include "mongo/db/repl/network_interface_mock.h" +#include "mongo/db/repl/repl_set_heartbeat_args.h" #include "mongo/db/repl/replica_set_config.h" #include "mongo/db/repl/replication_executor.h" #include "mongo/stdx/functional.h" @@ -138,13 +139,14 @@ namespace { const BSONObj makeHeartbeatRequest(const ReplicaSetConfig& rsConfig, int myConfigIndex) { const MemberConfig& myConfig = rsConfig.getMemberAt(myConfigIndex); - return BSON( - "replSetHeartbeat" << rsConfig.getReplSetName() << - "v" << rsConfig.getConfigVersion() << - "pv" << 1 << - "checkEmpty" << (rsConfig.getConfigVersion() == 1) << - "from" << myConfig.getHostAndPort().toString() << - "fromId" << myConfig.getId()); + ReplSetHeartbeatArgs hbArgs; + hbArgs.setSetName(rsConfig.getReplSetName()); + hbArgs.setProtocolVersion(1); + hbArgs.setConfigVersion(rsConfig.getConfigVersion()); + hbArgs.setCheckEmpty(rsConfig.getConfigVersion() == 1); + hbArgs.setSenderHost(myConfig.getHostAndPort()); + hbArgs.setSenderId(myConfig.getId()); + return hbArgs.toBSON(); } TEST_F(CheckQuorumForInitiate, QuorumCheckSuccessForFiveNodes) { |