Skip to content

Commit 2c8f21d

Browse files
mtrussottomtrussotto
committed
SERVER-29077 Rename MemberHeartbeatData in topology coordinator
Renamed MemberHeartbeatData to MemberData, renamed files to match, In topology coordinatory, renamed _hbData to _memberData. Renamed local memberHeartbeatData variables to memberData. Fixed a few files which unnecessarily included member_data.h.
1 parent f4c3c8d commit 2c8f21d

17 files changed

+323
-333
lines changed

‎src/mongo/db/repl/SConscript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ env.CppUnitTest(
514514
env.Library('topology_coordinator',
515515
[
516516
'heartbeat_response_action.cpp',
517-
'member_heartbeat_data.cpp',
517+
'member_data.cpp',
518518
'topology_coordinator.cpp',
519519
],
520520
LIBDEPS=[

‎src/mongo/db/repl/elect_cmd_runner.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#include "mongo/db/repl/elect_cmd_runner.h"
3434

3535
#include "mongo/base/status.h"
36-
#include "mongo/db/repl/member_heartbeat_data.h"
3736
#include "mongo/db/repl/repl_set_config.h"
3837
#include "mongo/db/repl/scatter_gather_runner.h"
3938
#include "mongo/util/log.h"

‎src/mongo/db/repl/elect_cmd_runner_test.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "mongo/base/status.h"
3232
#include "mongo/db/jsobj.h"
3333
#include "mongo/db/repl/elect_cmd_runner.h"
34-
#include "mongo/db/repl/member_heartbeat_data.h"
3534
#include "mongo/db/repl/repl_set_config.h"
3635
#include "mongo/executor/network_interface_mock.h"
3736
#include "mongo/executor/thread_pool_task_executor_test_fixture.h"

‎src/mongo/db/repl/freshness_checker.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
#include "mongo/base/status.h"
3636
#include "mongo/bson/timestamp.h"
37-
#include "mongo/db/repl/member_heartbeat_data.h"
3837
#include "mongo/db/repl/repl_set_config.h"
3938
#include "mongo/db/repl/scatter_gather_runner.h"
4039
#include "mongo/rpc/get_status_from_command_result.h"

‎src/mongo/db/repl/freshness_checker_test.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "mongo/base/status.h"
3232
#include "mongo/db/jsobj.h"
3333
#include "mongo/db/repl/freshness_checker.h"
34-
#include "mongo/db/repl/member_heartbeat_data.h"
3534
#include "mongo/db/repl/repl_set_config.h"
3635
#include "mongo/executor/network_interface_mock.h"
3736
#include "mongo/executor/thread_pool_task_executor_test_fixture.h"

‎src/mongo/db/repl/member_heartbeat_data.cpp‎ renamed to ‎src/mongo/db/repl/member_data.cpp‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,20 @@
3232

3333
#include <climits>
3434

35-
#include "mongo/db/repl/member_heartbeat_data.h"
35+
#include "mongo/db/repl/member_data.h"
3636
#include "mongo/db/repl/rslog.h"
3737
#include "mongo/util/log.h"
3838

3939
namespace mongo {
4040
namespace repl {
4141

42-
MemberHeartbeatData::MemberHeartbeatData()
43-
: _health(-1), _authIssue(false), _configIndex(-1), _isSelf(false) {
42+
MemberData::MemberData() : _health(-1), _authIssue(false), _configIndex(-1), _isSelf(false) {
4443
_lastResponse.setState(MemberState::RS_UNKNOWN);
4544
_lastResponse.setElectionTime(Timestamp());
4645
_lastResponse.setAppliedOpTime(OpTime());
4746
}
4847

49-
bool MemberHeartbeatData::setUpValues(Date_t now, ReplSetHeartbeatResponse&& hbResponse) {
48+
bool MemberData::setUpValues(Date_t now, ReplSetHeartbeatResponse&& hbResponse) {
5049
_health = 1;
5150
if (_upSince == Date_t()) {
5251
_upSince = now;
@@ -79,7 +78,7 @@ bool MemberHeartbeatData::setUpValues(Date_t now, ReplSetHeartbeatResponse&& hbR
7978
return opTimeAdvanced;
8079
}
8180

82-
void MemberHeartbeatData::setDownValues(Date_t now, const std::string& heartbeatMessage) {
81+
void MemberData::setDownValues(Date_t now, const std::string& heartbeatMessage) {
8382
_health = 0;
8483
_upSince = Date_t();
8584
_lastHeartbeat = now;
@@ -101,7 +100,7 @@ void MemberHeartbeatData::setDownValues(Date_t now, const std::string& heartbeat
101100
// heartbeat.
102101
}
103102

104-
void MemberHeartbeatData::setAuthIssue(Date_t now) {
103+
void MemberData::setAuthIssue(Date_t now) {
105104
_health = 0; // set health to 0 so that this doesn't count towards majority.
106105
_upSince = Date_t();
107106
_lastHeartbeat = now;
@@ -121,13 +120,13 @@ void MemberHeartbeatData::setAuthIssue(Date_t now) {
121120
_lastResponse.setSyncingTo(HostAndPort());
122121
}
123122

124-
void MemberHeartbeatData::setLastAppliedOpTime(OpTime opTime, Date_t now) {
123+
void MemberData::setLastAppliedOpTime(OpTime opTime, Date_t now) {
125124
_lastUpdate = now;
126125
_lastUpdateStale = false;
127126
_lastAppliedOpTime = opTime;
128127
}
129128

130-
void MemberHeartbeatData::setLastDurableOpTime(OpTime opTime, Date_t now) {
129+
void MemberData::setLastDurableOpTime(OpTime opTime, Date_t now) {
131130
_lastUpdate = now;
132131
_lastUpdateStale = false;
133132
if (_lastAppliedOpTime < opTime) {
@@ -143,7 +142,7 @@ void MemberHeartbeatData::setLastDurableOpTime(OpTime opTime, Date_t now) {
143142
}
144143
}
145144

146-
bool MemberHeartbeatData::advanceLastAppliedOpTime(OpTime opTime, Date_t now) {
145+
bool MemberData::advanceLastAppliedOpTime(OpTime opTime, Date_t now) {
147146
_lastUpdate = now;
148147
_lastUpdateStale = false;
149148
if (_lastAppliedOpTime < opTime) {
@@ -153,7 +152,7 @@ bool MemberHeartbeatData::advanceLastAppliedOpTime(OpTime opTime, Date_t now) {
153152
return false;
154153
}
155154

156-
bool MemberHeartbeatData::advanceLastDurableOpTime(OpTime opTime, Date_t now) {
155+
bool MemberData::advanceLastDurableOpTime(OpTime opTime, Date_t now) {
157156
_lastUpdate = now;
158157
_lastUpdateStale = false;
159158
if (_lastDurableOpTime < opTime) {

‎src/mongo/db/repl/member_heartbeat_data.h‎ renamed to ‎src/mongo/db/repl/member_data.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ namespace mongo {
3737
namespace repl {
3838

3939
/**
40-
* This class contains the data returned from a heartbeat command for one member
41-
* of a replica set.
40+
* This class contains the data from heartbeat responses and replSetUpdatePosition commands for one
41+
* member of a replica set.
4242
**/
43-
class MemberHeartbeatData {
43+
class MemberData {
4444
public:
45-
MemberHeartbeatData();
45+
MemberData();
4646

4747
MemberState getState() const {
4848
return _lastResponse.getState();
@@ -267,7 +267,7 @@ class MemberHeartbeatData {
267267
// Last known OpTime that the replica has applied, whether journaled or unjournaled.
268268
OpTime _lastAppliedOpTime;
269269

270-
// TODO(russotto): Since memberHeartbeatData is kept in config order, _configIndex
270+
// TODO(russotto): Since memberData is kept in config order, _configIndex
271271
// and _isSelf may not be necessary.
272272
// Index of this member in the replica set configuration.
273273
int _configIndex;

‎src/mongo/db/repl/repl_set_html_summary.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const std::string ReplSetHtmlSummary::toHtmlString() const {
138138

139139
for (int i = 0; i < _config.getNumMembers(); ++i) {
140140
const MemberConfig& memberConfig = _config.getMemberAt(i);
141-
const MemberHeartbeatData& memberHB = _hbData[i];
141+
const MemberData& memberHB = _memberData[i];
142142
bool isSelf = _selfIndex == i;
143143
bool up = memberHB.getHealth() > 0;
144144

@@ -201,7 +201,7 @@ const std::string ReplSetHtmlSummary::toHtmlString() const {
201201
const MemberConfig& selfConfig = _config.getMemberAt(_selfIndex);
202202

203203
if (_primaryIndex >= 0 && _primaryIndex != _selfIndex && !selfConfig.isArbiter()) {
204-
int lag = _hbData[_primaryIndex].getHeartbeatAppliedOpTime().getTimestamp().getSecs() -
204+
int lag = _memberData[_primaryIndex].getHeartbeatAppliedOpTime().getTimestamp().getSecs() -
205205
_selfOptime.getTimestamp().getSecs();
206206
s << tr("Lag: ", str::stream() << lag << " secs");
207207
}

‎src/mongo/db/repl/repl_set_html_summary.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <string>
3232
#include <vector>
3333

34-
#include "mongo/db/repl/member_heartbeat_data.h"
34+
#include "mongo/db/repl/member_data.h"
3535
#include "mongo/db/repl/optime.h"
3636
#include "mongo/db/repl/repl_set_config.h"
3737

@@ -53,8 +53,8 @@ class ReplSetHtmlSummary {
5353
_config = config;
5454
}
5555

56-
void setHBData(const std::vector<MemberHeartbeatData>& hbData) {
57-
_hbData = hbData;
56+
void setHBData(const std::vector<MemberData>& hbData) {
57+
_memberData = hbData;
5858
}
5959

6060
void setSelfIndex(int index) {
@@ -87,7 +87,7 @@ class ReplSetHtmlSummary {
8787

8888
private:
8989
ReplSetConfig _config;
90-
std::vector<MemberHeartbeatData> _hbData;
90+
std::vector<MemberData> _memberData;
9191
Date_t _now;
9292
int _selfIndex;
9393
int _primaryIndex;

‎src/mongo/db/repl/replication_coordinator_impl.cpp‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#include "mongo/db/repl/handshake_args.h"
5252
#include "mongo/db/repl/is_master_response.h"
5353
#include "mongo/db/repl/last_vote.h"
54+
#include "mongo/db/repl/member_data.h"
5455
#include "mongo/db/repl/old_update_position_args.h"
5556
#include "mongo/db/repl/read_concern_args.h"
5657
#include "mongo/db/repl/repl_client_info.h"
@@ -657,7 +658,7 @@ void ReplicationCoordinatorImpl::startup(OperationContext* opCtx) {
657658
fassert(18822, !_inShutdown);
658659
_setConfigState_inlock(kConfigStartingUp);
659660
_myRID = rid;
660-
_topCoord->getMyMemberHeartbeatData()->setRid(rid);
661+
_topCoord->getMyMemberData()->setRid(rid);
661662
}
662663

663664
if (!_settings.usingReplSets()) {
@@ -932,12 +933,12 @@ Status ReplicationCoordinatorImpl::setLastOptimeForSlave(const OID& rid, const T
932933

933934
// term == -1 for master-slave
934935
OpTime opTime(ts, OpTime::kUninitializedTerm);
935-
MemberHeartbeatData* memberHeartbeatData = _topCoord->findMemberHeartbeatDataByRid(rid);
936-
if (memberHeartbeatData) {
937-
memberHeartbeatData->advanceLastAppliedOpTime(opTime, _replExecutor->now());
936+
MemberData* memberData = _topCoord->findMemberDataByRid(rid);
937+
if (memberData) {
938+
memberData->advanceLastAppliedOpTime(opTime, _replExecutor->now());
938939
} else {
939-
auto* memberHeartbeatData = _topCoord->addSlaveMemberData(rid);
940-
memberHeartbeatData->setLastAppliedOpTime(opTime, _replExecutor->now());
940+
auto* memberData = _topCoord->addSlaveMemberData(rid);
941+
memberData->setLastAppliedOpTime(opTime, _replExecutor->now());
941942
}
942943
_updateLastCommittedOpTime_inlock();
943944
return Status::OK();
@@ -1008,19 +1009,19 @@ void ReplicationCoordinatorImpl::_reportUpstream_inlock(stdx::unique_lock<stdx::
10081009

10091010
void ReplicationCoordinatorImpl::_setMyLastAppliedOpTime_inlock(const OpTime& opTime,
10101011
bool isRollbackAllowed) {
1011-
auto* myMemberHeartbeatData = _topCoord->getMyMemberHeartbeatData();
1012-
invariant(isRollbackAllowed || myMemberHeartbeatData->getLastAppliedOpTime() <= opTime);
1013-
myMemberHeartbeatData->setLastAppliedOpTime(opTime, _replExecutor->now());
1012+
auto* myMemberData = _topCoord->getMyMemberData();
1013+
invariant(isRollbackAllowed || myMemberData->getLastAppliedOpTime() <= opTime);
1014+
myMemberData->setLastAppliedOpTime(opTime, _replExecutor->now());
10141015
_updateLastCommittedOpTime_inlock();
10151016
_opTimeWaiterList.signalAndRemoveIf_inlock(
10161017
[opTime](Waiter* waiter) { return waiter->opTime <= opTime; });
10171018
}
10181019

10191020
void ReplicationCoordinatorImpl::_setMyLastDurableOpTime_inlock(const OpTime& opTime,
10201021
bool isRollbackAllowed) {
1021-
auto* myMemberHeartbeatData = _topCoord->getMyMemberHeartbeatData();
1022-
invariant(isRollbackAllowed || myMemberHeartbeatData->getLastDurableOpTime() <= opTime);
1023-
myMemberHeartbeatData->setLastDurableOpTime(opTime, _replExecutor->now());
1022+
auto* myMemberData = _topCoord->getMyMemberData();
1023+
invariant(isRollbackAllowed || myMemberData->getLastDurableOpTime() <= opTime);
1024+
myMemberData->setLastDurableOpTime(opTime, _replExecutor->now());
10241025
_updateLastCommittedOpTime_inlock();
10251026
}
10261027

@@ -1257,8 +1258,8 @@ Status ReplicationCoordinatorImpl::_setLastOptime_inlock(
12571258
return Status(ErrorCodes::InvalidReplicaSetConfig, errmsg);
12581259
}
12591260

1260-
auto* memberHeartbeatData = _topCoord->findMemberHeartbeatDataByMemberId(args.memberId);
1261-
if (!memberHeartbeatData) {
1261+
auto* memberData = _topCoord->findMemberDataByMemberId(args.memberId);
1262+
if (!memberData) {
12621263
invariant(!_rsConfig.findMemberByID(args.memberId));
12631264

12641265
std::string errmsg = str::stream()
@@ -1268,16 +1269,16 @@ Status ReplicationCoordinatorImpl::_setLastOptime_inlock(
12681269
return Status(ErrorCodes::NodeNotFound, errmsg);
12691270
}
12701271

1271-
invariant(args.memberId == memberHeartbeatData->getMemberId());
1272+
invariant(args.memberId == memberData->getMemberId());
12721273

12731274
LOG(3) << "Node with memberID " << args.memberId << " has durably applied operations through "
1274-
<< memberHeartbeatData->getLastDurableOpTime() << " and has applied operations through "
1275-
<< memberHeartbeatData->getLastAppliedOpTime()
1275+
<< memberData->getLastDurableOpTime() << " and has applied operations through "
1276+
<< memberData->getLastAppliedOpTime()
12761277
<< "; updating to new durable operation with timestamp " << args.ts;
12771278

12781279
auto now(_replExecutor->now());
1279-
bool advancedOpTime = memberHeartbeatData->advanceLastAppliedOpTime(args.ts, now);
1280-
advancedOpTime = memberHeartbeatData->advanceLastDurableOpTime(args.ts, now) || advancedOpTime;
1280+
bool advancedOpTime = memberData->advanceLastAppliedOpTime(args.ts, now);
1281+
advancedOpTime = memberData->advanceLastDurableOpTime(args.ts, now) || advancedOpTime;
12811282

12821283
// Only update committed optime if the remote optimes increased.
12831284
if (advancedOpTime) {
@@ -1325,8 +1326,8 @@ Status ReplicationCoordinatorImpl::_setLastOptime_inlock(const UpdatePositionArg
13251326
return Status(ErrorCodes::InvalidReplicaSetConfig, errmsg);
13261327
}
13271328

1328-
auto* memberHeartbeatData = _topCoord->findMemberHeartbeatDataByMemberId(args.memberId);
1329-
if (!memberHeartbeatData) {
1329+
auto* memberData = _topCoord->findMemberDataByMemberId(args.memberId);
1330+
if (!memberData) {
13301331
invariant(!_rsConfig.findMemberByID(args.memberId));
13311332

13321333
std::string errmsg = str::stream()
@@ -1336,18 +1337,18 @@ Status ReplicationCoordinatorImpl::_setLastOptime_inlock(const UpdatePositionArg
13361337
return Status(ErrorCodes::NodeNotFound, errmsg);
13371338
}
13381339

1339-
invariant(args.memberId == memberHeartbeatData->getMemberId());
1340+
invariant(args.memberId == memberData->getMemberId());
13401341

13411342
LOG(3) << "Node with memberID " << args.memberId << " currently has optime "
1342-
<< memberHeartbeatData->getLastAppliedOpTime() << " durable through "
1343-
<< memberHeartbeatData->getLastDurableOpTime() << "; updating to optime "
1344-
<< args.appliedOpTime << " and durable through " << args.durableOpTime;
1343+
<< memberData->getLastAppliedOpTime() << " durable through "
1344+
<< memberData->getLastDurableOpTime() << "; updating to optime " << args.appliedOpTime
1345+
<< " and durable through " << args.durableOpTime;
13451346

13461347

13471348
auto now(_replExecutor->now());
1348-
bool advancedOpTime = memberHeartbeatData->advanceLastAppliedOpTime(args.appliedOpTime, now);
1349+
bool advancedOpTime = memberData->advanceLastAppliedOpTime(args.appliedOpTime, now);
13491350
advancedOpTime =
1350-
memberHeartbeatData->advanceLastDurableOpTime(args.durableOpTime, now) || advancedOpTime;
1351+
memberData->advanceLastDurableOpTime(args.durableOpTime, now) || advancedOpTime;
13511352

13521353
// Only update committed optime if the remote optimes increased.
13531354
if (advancedOpTime) {
@@ -2732,13 +2733,13 @@ Status ReplicationCoordinatorImpl::processHandshake(OperationContext* opCtx,
27322733
"The handshake command is only used for master/slave replication");
27332734
}
27342735

2735-
auto* memberHeartbeatData = _topCoord->findMemberHeartbeatDataByRid(handshake.getRid());
2736-
if (memberHeartbeatData) {
2736+
auto* memberData = _topCoord->findMemberDataByRid(handshake.getRid());
2737+
if (memberData) {
27372738
return Status::OK(); // nothing to do
27382739
}
27392740

2740-
memberHeartbeatData = _topCoord->addSlaveMemberData(handshake.getRid());
2741-
memberHeartbeatData->setHostAndPort(_externalState->getClientHostAndPort(opCtx));
2741+
memberData = _topCoord->addSlaveMemberData(handshake.getRid());
2742+
memberData->setHostAndPort(_externalState->getClientHostAndPort(opCtx));
27422743

27432744
return Status::OK();
27442745
}
@@ -3077,12 +3078,11 @@ Status ReplicationCoordinatorImpl::processHeartbeatV1(const ReplSetHeartbeatArgs
30773078
}
30783079
} else if (result.isOK()) {
30793080
// Update liveness for sending node.
3080-
auto* memberHeartbeatData =
3081-
_topCoord->findMemberHeartbeatDataByMemberId(args.getSenderId());
3082-
if (!memberHeartbeatData) {
3081+
auto* memberData = _topCoord->findMemberDataByMemberId(args.getSenderId());
3082+
if (!memberData) {
30833083
return result;
30843084
}
3085-
memberHeartbeatData->updateLiveness(_replExecutor->now());
3085+
memberData->updateLiveness(_replExecutor->now());
30863086
}
30873087
return result;
30883088
}

0 commit comments

Comments
 (0)