diff options
Diffstat (limited to 'src')
5 files changed, 1 insertions, 26 deletions
diff --git a/src/mongo/db/repl/replication_coordinator_external_state.h b/src/mongo/db/repl/replication_coordinator_external_state.h index 87ce0fef492..fa85660bdd4 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state.h +++ b/src/mongo/db/repl/replication_coordinator_external_state.h @@ -34,10 +34,8 @@ #include "mongo/base/disallow_copying.h" #include "mongo/bson/timestamp.h" #include "mongo/db/repl/member_state.h" -#include "mongo/db/repl/multiapplier.h" -#include "mongo/db/repl/oplog_applier.h" -#include "mongo/db/repl/oplog_buffer.h" #include "mongo/db/repl/optime.h" +#include "mongo/executor/task_executor.h" #include "mongo/stdx/functional.h" #include "mongo/util/concurrency/thread_pool.h" #include "mongo/util/time_support.h" @@ -298,11 +296,6 @@ public: */ virtual std::size_t getOplogFetcherMaxFetcherRestarts() const = 0; - /** - * Returns initial sync oplog application batch limits. - */ - virtual OplogApplier::BatchLimits getInitialSyncBatchLimits() const = 0; - /* * Creates noop writer instance. Setting the _noopWriter member is not protected by a guard, * hence it must be called before multi-threaded operations start. 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 05411e63295..e67d7fb594f 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp @@ -867,14 +867,6 @@ std::size_t ReplicationCoordinatorExternalStateImpl::getOplogFetcherMaxFetcherRe return oplogFetcherMaxFetcherRestarts.load(); } -OplogApplier::BatchLimits ReplicationCoordinatorExternalStateImpl::getInitialSyncBatchLimits() - const { - OplogApplier::BatchLimits batchLimits; - batchLimits.bytes = SyncTail::replBatchLimitBytes; - batchLimits.ops = std::size_t(SyncTail::replBatchLimitOperations.load()); - return batchLimits; -} - JournalListener::Token ReplicationCoordinatorExternalStateImpl::getToken() { return repl::ReplicationCoordinator::get(_service)->getMyLastAppliedOpTime(); } 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 fa61d1c94d2..32479c8d2ee 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.h +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.h @@ -107,7 +107,6 @@ public: virtual bool isReadCommittedSupportedByStorageEngine(OperationContext* opCtx) const; virtual bool isReadConcernSnapshotSupportedByStorageEngine(OperationContext* opCtx) const; virtual std::size_t getOplogFetcherMaxFetcherRestarts() const override; - OplogApplier::BatchLimits getInitialSyncBatchLimits() const final; // Methods from JournalListener. virtual JournalListener::Token getToken(); 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 fe45c993563..7bcfec46b9d 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_mock.cpp +++ b/src/mongo/db/repl/replication_coordinator_external_state_mock.cpp @@ -252,14 +252,6 @@ std::size_t ReplicationCoordinatorExternalStateMock::getOplogFetcherMaxFetcherRe return 0; } -OplogApplier::BatchLimits ReplicationCoordinatorExternalStateMock::getInitialSyncBatchLimits() - const { - OplogApplier::BatchLimits batchLimits; - batchLimits.bytes = 512 * 1024 * 1024U; - batchLimits.ops = 5000U; - return batchLimits; -} - void ReplicationCoordinatorExternalStateMock::setIsReadCommittedEnabled(bool val) { _isReadCommittedSupported = val; } 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 357d84e96ec..fa57e07c6d6 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_mock.h +++ b/src/mongo/db/repl/replication_coordinator_external_state_mock.h @@ -96,7 +96,6 @@ public: virtual bool isReadCommittedSupportedByStorageEngine(OperationContext* opCtx) const; virtual bool isReadConcernSnapshotSupportedByStorageEngine(OperationContext* opCtx) const; virtual std::size_t getOplogFetcherMaxFetcherRestarts() const override; - OplogApplier::BatchLimits getInitialSyncBatchLimits() const final; /** * Adds "host" to the list of hosts that this mock will match when responding to "isSelf" |