summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Bosch <geert@mongodb.com>2017-11-13 09:23:05 -0500
committerGeert Bosch <geert@mongodb.com>2017-11-13 19:51:21 -0500
commit351b4b12e45c7307d1bde5075d91b189423342c6 (patch)
treed7b0042a42e0d4422ae231fcb21af2035ead78d2
parentbace2a3017ebd46ca96cc81f48f039b80e00d92a (diff)
downloadmongo-351b4b12e45c7307d1bde5075d91b189423342c6.tar.gz
Revert "SERVER-31882 start a transaction when beginning a UnitOfWork"
This reverts commit 9a7ab2468ec94462890395cc591cd629d1dd9f7c.
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp2
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
index 336b7d9d486..232ecdcdbb7 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
@@ -1675,7 +1675,7 @@ void WiredTigerRecordStore::cappedTruncateAfter(OperationContext* opCtx,
Status WiredTigerRecordStore::oplogDiskLocRegister(OperationContext* opCtx,
const Timestamp& opTime) {
- // This labels the current transaction with a timestamp.
+ // This starts a new transaction and gives it a timestamp.
// This is required for oplog visibility to work correctly, as WiredTiger uses the transaction
// list to determine where there are holes in the oplog.
return opCtx->recoveryUnit()->setTimestamp(SnapshotName(opTime));
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp
index 67ddcb9d93d..8be67c449a5 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp
@@ -119,8 +119,6 @@ void WiredTigerRecoveryUnit::beginUnitOfWork(OperationContext* opCtx) {
invariant(!_areWriteUnitOfWorksBanned);
invariant(!_inUnitOfWork);
_inUnitOfWork = true;
- // Begin a new transaction, if one is not already started.
- getSession();
}
void WiredTigerRecoveryUnit::commitUnitOfWork() {