diff options
Diffstat (limited to 'src/mongo/s/catalog/dist_lock_manager.h')
| -rw-r--r-- | src/mongo/s/catalog/dist_lock_manager.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/s/catalog/dist_lock_manager.h b/src/mongo/s/catalog/dist_lock_manager.h index 0512a5dc481..18bb6bce786 100644 --- a/src/mongo/s/catalog/dist_lock_manager.h +++ b/src/mongo/s/catalog/dist_lock_manager.h @@ -76,7 +76,7 @@ public: MONGO_DISALLOW_COPYING(ScopedDistLock); public: - ScopedDistLock(OperationContext* txn, + ScopedDistLock(OperationContext* opCtx, DistLockHandle lockHandle, DistLockManager* lockManager); ~ScopedDistLock(); @@ -90,7 +90,7 @@ public: Status checkStatus(); private: - OperationContext* _txn; + OperationContext* _opCtx; DistLockHandle _lockID; DistLockManager* _lockManager; // Not owned here. }; @@ -107,7 +107,7 @@ public: * Cleanup the manager's resources. Implementations do not need to guarantee thread safety * so callers should employ proper synchronization when calling this method. */ - virtual void shutDown(OperationContext* txn) = 0; + virtual void shutDown(OperationContext* opCtx) = 0; /** * Returns the process ID for this DistLockManager. @@ -127,7 +127,7 @@ public: * Returns ErrorCodes::DistributedClockSkewed when a clock skew is detected. * Returns ErrorCodes::LockBusy if the lock is being held. */ - StatusWith<ScopedDistLock> lock(OperationContext* txn, + StatusWith<ScopedDistLock> lock(OperationContext* opCtx, StringData name, StringData whyMessage, Milliseconds waitFor); @@ -140,7 +140,7 @@ public: * immediately reacquired if "lockSessionID" matches that of the lock, rather than waiting for * the inactive lock to expire. */ - virtual StatusWith<DistLockHandle> lockWithSessionID(OperationContext* txn, + virtual StatusWith<DistLockHandle> lockWithSessionID(OperationContext* opCtx, StringData name, StringData whyMessage, const OID& lockSessionID, @@ -151,7 +151,7 @@ public: * anyone. Uses local write concern and does not attempt to overtake the lock or check whether * the lock lease has expired. */ - virtual StatusWith<DistLockHandle> tryLockWithLocalWriteConcern(OperationContext* txn, + virtual StatusWith<DistLockHandle> tryLockWithLocalWriteConcern(OperationContext* opCtx, StringData name, StringData whyMessage, const OID& lockSessionID) = 0; @@ -160,26 +160,26 @@ public: * Unlocks the given lockHandle. Will attempt to retry again later if the config * server is not reachable. */ - virtual void unlock(OperationContext* txn, const DistLockHandle& lockHandle) = 0; + virtual void unlock(OperationContext* opCtx, const DistLockHandle& lockHandle) = 0; /** * Unlocks the lock specified by "lockHandle" and "name". Will attempt to retry again later if * the config server is not reachable. */ - virtual void unlock(OperationContext* txn, + virtual void unlock(OperationContext* opCtx, const DistLockHandle& lockHandle, StringData name) = 0; /** * Makes a best-effort attempt to unlock all locks owned by the given processID. */ - virtual void unlockAll(OperationContext* txn, const std::string& processID) = 0; + virtual void unlockAll(OperationContext* opCtx, const std::string& processID) = 0; protected: /** * Checks if the lockHandle still exists in the config server. */ - virtual Status checkStatus(OperationContext* txn, const DistLockHandle& lockHandle) = 0; + virtual Status checkStatus(OperationContext* opCtx, const DistLockHandle& lockHandle) = 0; }; } // namespace mongo |