SERVER-30936 Ensure operation session info is initialized only once

1 files changed, 10 insertions, 10 deletions

diff --git a/src/mongo/db/session.cpp b/src/mongo/db/session.cpp
index 6ff0d43cab0..632125abde6 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 = _txnRecord;
+            txnRecord = _lastWrittenTxnRecord;
         }
 
         // 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);
-            _txnRecord = txnRecord;
+            _lastWrittenTxnRecord = 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) {
-                _txnRecord.reset();
+                _lastWrittenTxnRecord.reset();
                 continue;
             }
 
-            _txnRecord = std::move(txnRecord);
+            _lastWrittenTxnRecord = 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);
-    _txnRecord->setLastWriteOpTimeTs(opTimeTs);
+    _lastWrittenTxnRecord->setLastWriteOpTimeTs(opTimeTs);
 }
 
 TxnNumber Session::getTxnNum() const {
     stdx::lock_guard<stdx::mutex> lg(_mutex);
-    invariant(_txnRecord);
-    return _txnRecord->getTxnNum();
+    invariant(_lastWrittenTxnRecord);
+    return _lastWrittenTxnRecord->getTxnNum();
 }
 
 Timestamp Session::getLastWriteOpTimeTs() const {
     stdx::lock_guard<stdx::mutex> lg(_mutex);
-    invariant(_txnRecord);
-    return _txnRecord->getLastWriteOpTimeTs();
+    invariant(_lastWrittenTxnRecord);
+    return _lastWrittenTxnRecord->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);
-    _txnRecord.reset();
+    _lastWrittenTxnRecord.reset();
     _generation += 1;
 }