summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/tenant_oplog_batcher.cpp
diff options
context:
space:
mode:
authorA. Jesse Jiryu Davis <jesse@mongodb.com>2021-12-15 20:05:46 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-12-15 21:07:27 +0000
commit57db2b83401812f2899a4c02bd896e1c8b6ab046 (patch)
tree46c9130da69d923193e1948c3ad3ae5f1bd53875 /src/mongo/db/repl/tenant_oplog_batcher.cpp
parentaf5534436c8fc64aca835d98cb778f282188e8ab (diff)
downloadmongo-57db2b83401812f2899a4c02bd896e1c8b6ab046.tar.gz
Revert "SERVER-61666 Fix migration for txns before startApplying"
This reverts commit ea6a59377c01ed48157557aaaae0bd8191b7fa4e.
Diffstat (limited to 'src/mongo/db/repl/tenant_oplog_batcher.cpp')
-rw-r--r--src/mongo/db/repl/tenant_oplog_batcher.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mongo/db/repl/tenant_oplog_batcher.cpp b/src/mongo/db/repl/tenant_oplog_batcher.cpp
index c7a3bf3c87b..e0d7539fcf6 100644
--- a/src/mongo/db/repl/tenant_oplog_batcher.cpp
+++ b/src/mongo/db/repl/tenant_oplog_batcher.cpp
@@ -42,13 +42,11 @@ namespace repl {
TenantOplogBatcher::TenantOplogBatcher(const std::string& tenantId,
RandomAccessOplogBuffer* oplogBuffer,
std::shared_ptr<executor::TaskExecutor> executor,
- Timestamp resumeBatchingTs,
- OpTime beginApplyingAfterOpTime)
+ Timestamp resumeBatchingTs)
: AbstractAsyncComponent(executor.get(), std::string("TenantOplogBatcher_") + tenantId),
_oplogBuffer(oplogBuffer),
_executor(executor),
- _resumeBatchingTs(resumeBatchingTs),
- _beginApplyingAfterOpTime(beginApplyingAfterOpTime) {}
+ _resumeBatchingTs(resumeBatchingTs) {}
TenantOplogBatcher::~TenantOplogBatcher() {
shutdown();
@@ -64,10 +62,6 @@ void TenantOplogBatcher::_pushEntry(OperationContext* opCtx,
!op.isPreparedCommit() &&
(op.getCommandType() != OplogEntry::CommandType::kApplyOps || !op.shouldPrepare()));
if (op.isTerminalApplyOps()) {
- if (op.getOpTime() <= _beginApplyingAfterOpTime) {
- // Fetched for the sake of retryable commitTransaction, don't need to apply.
- return;
- }
// All applyOps entries are expanded and the expansions put in the batch expansion array.
// The original applyOps is kept in the batch ops array.
// This applies to both multi-document transactions and atomic applyOps.