diff --git a/src/mongo/db/repl/repl_set_commands.cpp b/src/mongo/db/repl/repl_set_commands.cpp index 820b70519b1..a59a28749b0 100644 --- a/src/mongo/db/repl/repl_set_commands.cpp +++ b/src/mongo/db/repl/repl_set_commands.cpp @@ -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)); diff --git a/src/mongo/db/repl/replication_coordinator.h b/src/mongo/db/repl/replication_coordinator.h index 037dff5c220..a28924e7978 100644 --- a/src/mongo/db/repl/replication_coordinator.h +++ b/src/mongo/db/repl/replication_coordinator.h @@ -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; diff --git a/src/mongo/db/repl/replication_coordinator_impl.h b/src/mongo/db/repl/replication_coordinator_impl.h index 3c9a8ad0283..e72dd099e0e 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.h +++ b/src/mongo/db/repl/replication_coordinator_impl.h @@ -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; diff --git a/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp b/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp index 9aef583be07..8a9721130a2 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_step_up_step_down.cpp @@ -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; diff --git a/src/mongo/db/repl/replication_coordinator_mock.cpp b/src/mongo/db/repl/replication_coordinator_mock.cpp index 8dfbc0b3c7a..4ab9edf8459 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.cpp +++ b/src/mongo/db/repl/replication_coordinator_mock.cpp @@ -750,7 +750,7 @@ WriteConcernOptions ReplicationCoordinatorMock::populateUnsetWriteConcernOptions return wc; } -Status ReplicationCoordinatorMock::stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) { +Status ReplicationCoordinatorMock::stepUpIfEligible(bool skipDryRun) { return Status::OK(); } diff --git a/src/mongo/db/repl/replication_coordinator_mock.h b/src/mongo/db/repl/replication_coordinator_mock.h index e6bc4160a3a..6da6007b6f0 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.h +++ b/src/mongo/db/repl/replication_coordinator_mock.h @@ -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. diff --git a/src/mongo/db/repl/replication_coordinator_noop.cpp b/src/mongo/db/repl/replication_coordinator_noop.cpp index ceb0fd9d93f..afec79c5d31 100644 --- a/src/mongo/db/repl/replication_coordinator_noop.cpp +++ b/src/mongo/db/repl/replication_coordinator_noop.cpp @@ -531,7 +531,7 @@ void ReplicationCoordinatorNoOp::clearCommittedSnapshot() { MONGO_UNREACHABLE; } -Status ReplicationCoordinatorNoOp::stepUpIfEligible(OperationContext* opCtx, bool skipDryRun) { +Status ReplicationCoordinatorNoOp::stepUpIfEligible(bool skipDryRun) { MONGO_UNREACHABLE; } diff --git a/src/mongo/db/repl/replication_coordinator_noop.h b/src/mongo/db/repl/replication_coordinator_noop.h index 311f84f14dc..65567edf9a8 100644 --- a/src/mongo/db/repl/replication_coordinator_noop.h +++ b/src/mongo/db/repl/replication_coordinator_noop.h @@ -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;