diff options
7 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_external_state.h b/src/mongo/db/repl/replication_coordinator_external_state.h index 29cc6dd9c5b..3f5989674ad 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state.h +++ b/src/mongo/db/repl/replication_coordinator_external_state.h @@ -77,7 +77,7 @@ public: * * NOTE: Only starts threads if they are not already started, */ - virtual void startThreads(const ReplSettings& settings) = 0; + virtual void startThreads() = 0; /** * Returns true if an incomplete initial sync is detected. diff --git a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp index 4d22c88506e..717cba25db6 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp @@ -317,7 +317,7 @@ void ReplicationCoordinatorExternalStateImpl::_stopDataReplication_inlock( } -void ReplicationCoordinatorExternalStateImpl::startThreads(const ReplSettings& settings) { +void ReplicationCoordinatorExternalStateImpl::startThreads() { stdx::lock_guard<Latch> lk(_threadMutex); if (_startedThreads) { return; diff --git a/src/mongo/db/repl/replication_coordinator_external_state_impl.h b/src/mongo/db/repl/replication_coordinator_external_state_impl.h index f38aee76a39..6769cccf177 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.h +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.h @@ -66,7 +66,7 @@ public: StorageInterface* storageInterface, ReplicationProcess* replicationProcess); virtual ~ReplicationCoordinatorExternalStateImpl(); - virtual void startThreads(const ReplSettings& settings) override; + virtual void startThreads() override; virtual void startSteadyStateReplication(OperationContext* opCtx, ReplicationCoordinator* replCoord) override; virtual void stopDataReplication(OperationContext* opCtx) override; diff --git a/src/mongo/db/repl/replication_coordinator_external_state_mock.cpp b/src/mongo/db/repl/replication_coordinator_external_state_mock.cpp index 4c9ddbaf7f1..5bf38ef5eb0 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_mock.cpp +++ b/src/mongo/db/repl/replication_coordinator_external_state_mock.cpp @@ -60,7 +60,7 @@ ReplicationCoordinatorExternalStateMock::ReplicationCoordinatorExternalStateMock ReplicationCoordinatorExternalStateMock::~ReplicationCoordinatorExternalStateMock() {} -void ReplicationCoordinatorExternalStateMock::startThreads(const ReplSettings& settings) { +void ReplicationCoordinatorExternalStateMock::startThreads() { _threadsStarted = true; } diff --git a/src/mongo/db/repl/replication_coordinator_external_state_mock.h b/src/mongo/db/repl/replication_coordinator_external_state_mock.h index fd867df8ac7..425a759749c 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_mock.h +++ b/src/mongo/db/repl/replication_coordinator_external_state_mock.h @@ -59,7 +59,7 @@ public: ReplicationCoordinatorExternalStateMock(); virtual ~ReplicationCoordinatorExternalStateMock(); - virtual void startThreads(const ReplSettings& settings) override; + virtual void startThreads() override; virtual void startSteadyStateReplication(OperationContext* opCtx, ReplicationCoordinator* replCoord) override; virtual void stopDataReplication(OperationContext* opCtx) override; diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 01b9b230968..634a78193c5 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -717,7 +717,7 @@ void ReplicationCoordinatorImpl::_finishLoadLocalConfig( _performPostMemberStateUpdateAction(action); if (!isArbiter) { - _externalState->startThreads(_settings); + _externalState->startThreads(); _startDataReplication(opCtx.get()); } } @@ -3923,7 +3923,7 @@ Status ReplicationCoordinatorImpl::processReplSetInitiate(OperationContext* opCt // A configuration passed to replSetInitiate() with the current node as an arbiter // will fail validation with a "replSet initiate got ... while validating" reason. invariant(!newConfig.getMemberAt(myIndex.getValue()).isArbiter()); - _externalState->startThreads(_settings); + _externalState->startThreads(); _startDataReplication(opCtx); configStateGuard.dismiss(); diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp index 0cbea806d58..3c3fa15769b 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp @@ -709,7 +709,7 @@ void ReplicationCoordinatorImpl::_heartbeatReconfigStore( if (shouldStartDataReplication) { auto opCtx = cc().makeOperationContext(); _replicationProcess->getConsistencyMarkers()->initializeMinValidDocument(opCtx.get()); - _externalState->startThreads(_settings); + _externalState->startThreads(); _startDataReplication(opCtx.get()); } } |