diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-09-06 19:01:03 -0400 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-09-06 19:01:03 -0400 |
commit | b78e4b8e753f7980036cd51a052555a29c89bf1c (patch) | |
tree | dbc814d32dec046f43fe0156d2b624e6d66f9c77 /src/mongo/db/session.cpp | |
parent | 250181f4feb7ac49cec8ff7251f844d69c4710be (diff) | |
download | mongo-b78e4b8e753f7980036cd51a052555a29c89bf1c.tar.gz |
Revert "SERVER-30936 Ensure operation session info is initialized only once"
This reverts commit e00c6d29996ba52b5a77a072d1c5c555f62b8534.
Diffstat (limited to 'src/mongo/db/session.cpp')
-rw-r--r-- | src/mongo/db/session.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/db/session.cpp b/src/mongo/db/session.cpp index 632125abde6..6ff0d43cab0 100644 --- a/src/mongo/db/session.cpp +++ b/src/mongo/db/session.cpp @@ -106,7 +106,7 @@ void Session::begin(OperationContext* opCtx, const TxnNumber& txnNumber) { { stdx::lock_guard<stdx::mutex> lg(_mutex); startGeneration = _generation; - txnRecord = _lastWrittenTxnRecord; + txnRecord = _txnRecord; } // Do I/O outside of the lock. @@ -121,7 +121,7 @@ void Session::begin(OperationContext* opCtx, const TxnNumber& txnNumber) { } stdx::lock_guard<stdx::mutex> lg(_mutex); - _lastWrittenTxnRecord = txnRecord; + _txnRecord = txnRecord; } uassert(40528, @@ -144,11 +144,11 @@ void Session::begin(OperationContext* opCtx, const TxnNumber& txnNumber) { // Reload if the session was modified since the beginning of this loop, e.g. by // rollback. if (startGeneration != _generation) { - _lastWrittenTxnRecord.reset(); + _txnRecord.reset(); continue; } - _lastWrittenTxnRecord = std::move(txnRecord); + _txnRecord = std::move(txnRecord); return; } } @@ -184,19 +184,19 @@ void Session::saveTxnProgress(OperationContext* opCtx, Timestamp opTimeTs) { updateResult.numDocsModified >= 1); stdx::lock_guard<stdx::mutex> lg(_mutex); - _lastWrittenTxnRecord->setLastWriteOpTimeTs(opTimeTs); + _txnRecord->setLastWriteOpTimeTs(opTimeTs); } TxnNumber Session::getTxnNum() const { stdx::lock_guard<stdx::mutex> lg(_mutex); - invariant(_lastWrittenTxnRecord); - return _lastWrittenTxnRecord->getTxnNum(); + invariant(_txnRecord); + return _txnRecord->getTxnNum(); } Timestamp Session::getLastWriteOpTimeTs() const { stdx::lock_guard<stdx::mutex> lg(_mutex); - invariant(_lastWrittenTxnRecord); - return _lastWrittenTxnRecord->getLastWriteOpTimeTs(); + invariant(_txnRecord); + return _txnRecord->getLastWriteOpTimeTs(); } TransactionHistoryIterator Session::getWriteHistory(OperationContext* opCtx) const { @@ -205,7 +205,7 @@ TransactionHistoryIterator Session::getWriteHistory(OperationContext* opCtx) con void Session::reset() { stdx::lock_guard<stdx::mutex> lg(_mutex); - _lastWrittenTxnRecord.reset(); + _txnRecord.reset(); _generation += 1; } |