diff options
| author | Ian Boros <ian.boros@mongodb.com> | 2022-01-19 21:21:53 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-19 23:03:19 +0000 |
| commit | d8afa17c615c274390899917d19180e374040f3e (patch) | |
| tree | e9efc40d03b37026e1bad40752666fbd6cad5b33 /src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp | |
| parent | 6a08c23ebeab0e0434226cbc6c690b458e61d745 (diff) | |
| download | mongo-d8afa17c615c274390899917d19180e374040f3e.tar.gz | |
SERVER-60742 Maintain RecoveryUnit and storage resources across getMores for non-exchange aggregation operations
Diffstat (limited to 'src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp')
| -rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp index 176ad6694af..19b40e4403a 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_recovery_unit.cpp @@ -352,7 +352,7 @@ void WiredTigerRecoveryUnit::doAbandonSnapshot() { if (_isActive()) { // Can't be in a WriteUnitOfWork, so safe to rollback if the AbandonSnapshotMode is // kAbort. If kCommit, however, then any active cursors will remain positioned and valid. - _txnClose(_abandonSnapshotMode == AbandonSnapshotMode::kCommit /* commit */); + _txnClose(abandonSnapshotMode() == AbandonSnapshotMode::kCommit /* commit */); } _setState(State::kInactive); } @@ -379,7 +379,7 @@ void WiredTigerRecoveryUnit::refreshSnapshot() { invariant(_isActive()); invariant(!_inUnitOfWork()); invariant(!_noEvictionAfterRollback); - invariant(_abandonSnapshotMode == AbandonSnapshotMode::kAbort); + invariant(abandonSnapshotMode() == AbandonSnapshotMode::kAbort); auto newSession = _sessionCache->getSession(); WiredTigerBeginTxnBlock txnOpen(newSession->getSession(), @@ -493,7 +493,6 @@ void WiredTigerRecoveryUnit::_txnClose(bool commit) { LOGV2_DEBUG( 22412, 3, "WT commit_transaction", "snapshotId"_attr = getSnapshotId().toNumber()); } else { - invariant(_abandonSnapshotMode == AbandonSnapshotMode::kAbort); StringBuilder config; if (_noEvictionAfterRollback) { // The only point at which rollback_transaction() can time out is in the bonus-eviction |