diff options
Diffstat (limited to 'src/mongo/s/catalog/dist_lock_catalog_impl.h')
| -rw-r--r-- | src/mongo/s/catalog/dist_lock_catalog_impl.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/mongo/s/catalog/dist_lock_catalog_impl.h b/src/mongo/s/catalog/dist_lock_catalog_impl.h index 6f26a3a1235..ab1c88bd250 100644 --- a/src/mongo/s/catalog/dist_lock_catalog_impl.h +++ b/src/mongo/s/catalog/dist_lock_catalog_impl.h @@ -52,11 +52,12 @@ public: virtual ~DistLockCatalogImpl(); - virtual StatusWith<LockpingsType> getPing(OperationContext* txn, StringData processID) override; + virtual StatusWith<LockpingsType> getPing(OperationContext* opCtx, + StringData processID) override; - virtual Status ping(OperationContext* txn, StringData processID, Date_t ping) override; + virtual Status ping(OperationContext* opCtx, StringData processID, Date_t ping) override; - virtual StatusWith<LocksType> grabLock(OperationContext* txn, + virtual StatusWith<LocksType> grabLock(OperationContext* opCtx, StringData lockID, const OID& lockSessionID, StringData who, @@ -65,7 +66,7 @@ public: StringData why, const WriteConcernOptions& writeConcern) override; - virtual StatusWith<LocksType> overtakeLock(OperationContext* txn, + virtual StatusWith<LocksType> overtakeLock(OperationContext* opCtx, StringData lockID, const OID& lockSessionID, const OID& currentHolderTS, @@ -74,27 +75,27 @@ public: Date_t time, StringData why) override; - virtual Status unlock(OperationContext* txn, const OID& lockSessionID) override; + virtual Status unlock(OperationContext* opCtx, const OID& lockSessionID) override; - virtual Status unlock(OperationContext* txn, + virtual Status unlock(OperationContext* opCtx, const OID& lockSessionID, StringData name) override; - virtual Status unlockAll(OperationContext* txn, const std::string& processID) override; + virtual Status unlockAll(OperationContext* opCtx, const std::string& processID) override; - virtual StatusWith<ServerInfo> getServerInfo(OperationContext* txn) override; + virtual StatusWith<ServerInfo> getServerInfo(OperationContext* opCtx) override; - virtual StatusWith<LocksType> getLockByTS(OperationContext* txn, + virtual StatusWith<LocksType> getLockByTS(OperationContext* opCtx, const OID& lockSessionID) override; - virtual StatusWith<LocksType> getLockByName(OperationContext* txn, StringData name) override; + virtual StatusWith<LocksType> getLockByName(OperationContext* opCtx, StringData name) override; - virtual Status stopPing(OperationContext* txn, StringData processId) override; + virtual Status stopPing(OperationContext* opCtx, StringData processId) override; private: - Status _unlock(OperationContext* txn, const FindAndModifyRequest& request); + Status _unlock(OperationContext* opCtx, const FindAndModifyRequest& request); - StatusWith<std::vector<BSONObj>> _findOnConfig(OperationContext* txn, + StatusWith<std::vector<BSONObj>> _findOnConfig(OperationContext* opCtx, const ReadPreferenceSetting& readPref, const NamespaceString& nss, const BSONObj& query, |