diff options
author | Blake Oler <blake.oler@mongodb.com> | 2019-03-05 12:38:48 -0500 |
---|---|---|
committer | Blake Oler <blake.oler@mongodb.com> | 2019-03-20 10:41:44 -0400 |
commit | 38c94f316b167e4b54b54ba8d12dbec33c7c5165 (patch) | |
tree | 6656b2d16ebd2b250204fec9d53839b9a081d555 /src/mongo/db/s/op_observer_sharding_impl.cpp | |
parent | a29bc63851e6af79dea0dead43dcba163bceaec9 (diff) | |
download | mongo-38c94f316b167e4b54b54ba8d12dbec33c7c5165.tar.gz |
SERVER-39935 Don't pass in optime when migrating transaction statements
Diffstat (limited to 'src/mongo/db/s/op_observer_sharding_impl.cpp')
-rw-r--r-- | src/mongo/db/s/op_observer_sharding_impl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/s/op_observer_sharding_impl.cpp b/src/mongo/db/s/op_observer_sharding_impl.cpp index 42e67ba950c..d4eff6b15d9 100644 --- a/src/mongo/db/s/op_observer_sharding_impl.cpp +++ b/src/mongo/db/s/op_observer_sharding_impl.cpp @@ -161,9 +161,7 @@ void OpObserverShardingImpl::shardObserveDeleteOp(OperationContext* opCtx, } void OpObserverShardingImpl::shardObserveTransactionPrepareOrUnpreparedCommit( - OperationContext* opCtx, - const std::vector<repl::ReplOperation>& stmts, - const repl::OpTime& opTime) { + OperationContext* opCtx, const std::vector<repl::ReplOperation>& stmts) { for (const auto stmt : stmts) { auto const nss = stmt.getNss(); @@ -178,16 +176,18 @@ void OpObserverShardingImpl::shardObserveTransactionPrepareOrUnpreparedCommit( auto const opType = stmt.getOpType(); + // We pass an empty opTime to observers because retryable write history doesn't care about + // writes in transactions. if (opType == repl::OpTypeEnum::kInsert) { - msm->getCloner()->onInsertOp(opCtx, stmt.getObject(), opTime); + msm->getCloner()->onInsertOp(opCtx, stmt.getObject(), {}); } else if (opType == repl::OpTypeEnum::kUpdate) { if (auto updateDoc = stmt.getObject2()) { - msm->getCloner()->onUpdateOp(opCtx, *updateDoc, opTime, {}); + msm->getCloner()->onUpdateOp(opCtx, *updateDoc, {}, {}); } } else if (opType == repl::OpTypeEnum::kDelete) { if (isMigratingWithCSRLock(csr, csrLock, stmt.getObject())) { msm->getCloner()->onDeleteOp( - opCtx, getDocumentKey(opCtx, nss, stmt.getObject()), opTime, {}); + opCtx, getDocumentKey(opCtx, nss, stmt.getObject()), {}, {}); } } } |