summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/lock_state.h
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2018-10-24 11:43:57 +0200
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2018-10-25 18:56:12 +0200
commit58cfddf1bdc0aca99a9dcb5666279349621fd156 (patch)
tree3df5cf832bf81f87cb4ce2a1bfceab4328cccb7b /src/mongo/db/concurrency/lock_state.h
parent1b897361cdf0119bec00400e4ca287809e87c79b (diff)
downloadmongo-58cfddf1bdc0aca99a9dcb5666279349621fd156.tar.gz
SERVER-37711 Revert commits related to lock yielding for prepared transactions on step down
This change reverts the following commits: * SERVER-35870 Allow stepdown to work with prepared transactions (f96903979ac329a760e7b6f1bb5d8695d3daf2a7) * SERVER-36913 Add functionality to LockManager for repl state transitions with prepared transactions (e65ff57e108ed69c46cc0b0ccbdd675663de2469) * SERVER-35870 Allow more than one thread to block Session checkout at a time (9406af079a894bae80fbbec4703b04974bf84476) * SERVER-35870 Add functionality to prevent Session checkouts & wait for all Sessions to be checked in (c6d90316d6b694e12426274c713a4a078e004fc5)
Diffstat (limited to 'src/mongo/db/concurrency/lock_state.h')
-rw-r--r--src/mongo/db/concurrency/lock_state.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mongo/db/concurrency/lock_state.h b/src/mongo/db/concurrency/lock_state.h
index fce45afc56c..4532e0e9830 100644
--- a/src/mongo/db/concurrency/lock_state.h
+++ b/src/mongo/db/concurrency/lock_state.h
@@ -189,21 +189,12 @@ public:
const boost::optional<SingleThreadedLockStats> lockStatsBase) const final;
virtual bool saveLockStateAndUnlock(LockSnapshot* stateOut);
- virtual bool saveLockStateAndUnlockForPrepare(LockSnapshot* stateOut);
virtual void restoreLockState(OperationContext* opCtx, const LockSnapshot& stateToRestore);
virtual void restoreLockState(const LockSnapshot& stateToRestore) {
restoreLockState(nullptr, stateToRestore);
}
- void restoreLockStateWithTemporaryGlobalResource(
- OperationContext* opCtx,
- const LockSnapshot& stateToRestore,
- LockManager::TemporaryResourceQueue* tempGlobalResource) override;
-
- void replaceGlobalLockStateWithTemporaryGlobalResource(
- LockManager::TemporaryResourceQueue* tempGlobalResource) override;
-
virtual void releaseTicket();
virtual void reacquireTicket(OperationContext* opCtx);
@@ -342,10 +333,6 @@ private:
// If true, shared locks will participate in two-phase locking.
bool _sharedLocksShouldTwoPhaseLock = false;
- // When true it means we are in the process of saving/restoring locks for prepared transactions.
- // Two-phase locking gets disabled in this mode to allow yielding locks from within a WUOW.
- bool _prepareModeForLockYields = false;
-
// If this is set, dictates the max number of milliseconds that we will wait for lock
// acquisition. Effectively resets lock acquisition deadlines to time out sooner. If set to 0,
// for example, lock attempts will time out immediately if the lock is not immediately