diff options
| author | Xuerui Fa <xuerui.fa@mongodb.com> | 2020-02-10 15:15:42 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-18 17:07:55 +0000 |
| commit | 99e7754701d5be6fafb567296540df36cb26ab87 (patch) | |
| tree | 62a554d041a22c716ca07c9fa09e6aea913178a2 /src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp | |
| parent | 19f7a856c0b1c80c378191d5ae3451cdd09e5c61 (diff) | |
| download | mongo-99e7754701d5be6fafb567296540df36cb26ab87.tar.gz | |
SERVER-28680: Fix naming of lastCommittedOp field in replSetRequestVotes
Diffstat (limited to 'src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp')
| -rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp b/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp index 61910c41c1e..5488b9a68f7 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp @@ -136,9 +136,9 @@ void ReplicationCoordinatorImpl::_startElectSelfV1_inlock(StartElectionReasonEnu invariant(_rsConfig.getMemberAt(_selfIndex).isElectable()); - const auto lastOpTime = _getMyLastAppliedOpTime_inlock(); + const auto lastAppliedOpTime = _getMyLastAppliedOpTime_inlock(); - if (lastOpTime == OpTime()) { + if (lastAppliedOpTime == OpTime()) { LOGV2(21436, "not trying to elect self, " "do not yet have a complete set of data from any point in time"); @@ -173,7 +173,7 @@ void ReplicationCoordinatorImpl::_startElectSelfV1_inlock(StartElectionReasonEnu _selfIndex, term, true, // dry run - lastOpTime, + lastAppliedOpTime, primaryIndex); if (nextPhaseEvh.getStatus() == ErrorCodes::ShutdownInProgress) { return; @@ -328,11 +328,11 @@ void ReplicationCoordinatorImpl::_writeLastVoteForMyElection( void ReplicationCoordinatorImpl::_startVoteRequester_inlock(long long newTerm, StartElectionReasonEnum reason) { - const auto lastOpTime = _getMyLastAppliedOpTime_inlock(); + const auto lastAppliedOpTime = _getMyLastAppliedOpTime_inlock(); _voteRequester.reset(new VoteRequester); StatusWith<executor::TaskExecutor::EventHandle> nextPhaseEvh = _voteRequester->start( - _replExecutor.get(), _rsConfig, _selfIndex, newTerm, false, lastOpTime, -1); + _replExecutor.get(), _rsConfig, _selfIndex, newTerm, false, lastAppliedOpTime, -1); if (nextPhaseEvh.getStatus() == ErrorCodes::ShutdownInProgress) { return; } |