xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "SERVER-118853 Refactor code from _completeStepUp() into stepUpIfEligible()" (#49272)

Browse Source 
GitOrigin-RevId: 2e5200649ea1fb9d97f02d617aa18b17007ccd88
This commit is contained in:
Nicholas Shectman
2026-03-09 15:04:08 -04:00
committed by MongoDB Bot
parent 2cc62a244f
commit 4055ee7c19
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mongo/db/repl/repl_set_commands.cpp
View File

@@ -791,7 +791,7 @@ public:
LOGV2(21581, "Received replSetStepUp request");
const bool skipDryRun = cmdObj["skipDryRun"].trueValue();
status = ReplicationCoordinator::get(opCtx)->stepUpIfEligible(opCtx, skipDryRun);
status = ReplicationCoordinator::get(opCtx)->stepUpIfEligible(skipDryRun);
if (!status.isOK()) {
LOGV2(21582, "replSetStepUp request failed", "error"_attr = causedBy(status));

2
src/mongo/db/repl/replication_coordinator.h
View File

@@ -1052,7 +1052,7 @@ public:
virtual WriteConcernOptions populateUnsetWriteConcernOptionsSyncMode(
WriteConcernOptions wc) = 0;
virtual Status stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) = 0;
virtual Status stepUpIfEligible(bool skipDryRun) = 0;
virtual ServiceContext* getServiceContext() = 0;

2
src/mongo/db/repl/replication_coordinator_impl.h
View File

@@ -475,7 +475,7 @@ public:
WriteConcernOptions populateUnsetWriteConcernOptionsSyncMode(WriteConcernOptions wc) override;
Status stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) override;
Status stepUpIfEligible(bool skipDryRun) override;
Status abortCatchupIfNeeded(PrimaryCatchUpConclusionReason reason) override;

2
src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp
View File

@@ -355,7 +355,7 @@ void ReplicationCoordinatorImpl::stepDown(OperationContext* opCtx,
(endTimeYieldLocksInvalidateSessions - startTimeYieldLocksInvalidateSessions));
}
Status ReplicationCoordinatorImpl::stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) {
Status ReplicationCoordinatorImpl::stepUpIfEligible(bool skipDryRun) {
auto reason = skipDryRun ? StartElectionReasonEnum::kStepUpRequestSkipDryRun
: StartElectionReasonEnum::kStepUpRequest;

2
src/mongo/db/repl/replication_coordinator_mock.cpp
View File

@@ -750,7 +750,7 @@ WriteConcernOptions ReplicationCoordinatorMock::populateUnsetWriteConcernOptions
return wc;
}
Status ReplicationCoordinatorMock::stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) {
Status ReplicationCoordinatorMock::stepUpIfEligible(bool skipDryRun) {
return Status::OK();
}

2
src/mongo/db/repl/replication_coordinator_mock.h
View File

@@ -382,7 +382,7 @@ public:
WriteConcernOptions populateUnsetWriteConcernOptionsSyncMode(WriteConcernOptions wc) override;
Status stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) override;
Status stepUpIfEligible(bool skipDryRun) override;
/**
* Sets the return value for calls to getConfig.

2
src/mongo/db/repl/replication_coordinator_noop.cpp
View File

@@ -531,7 +531,7 @@ void ReplicationCoordinatorNoOp::clearCommittedSnapshot() {
MONGO_UNREACHABLE;
}
Status ReplicationCoordinatorNoOp::stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) {
Status ReplicationCoordinatorNoOp::stepUpIfEligible(bool skipDryRun) {
MONGO_UNREACHABLE;
}

2
src/mongo/db/repl/replication_coordinator_noop.h
View File

@@ -334,7 +334,7 @@ public:
Status waitForPrimaryMajorityReadsAvailable(OperationContext* opCtx) const final;
Status stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) final;
Status stepUpIfEligible(bool skipDryRun) final;
Status abortCatchupIfNeeded(PrimaryCatchUpConclusionReason reason) final;