revision-id: 574dd4e574d60263db9d37faede89057caefafca (v5.8-1019-g574dd4e57) parent(s): 0ba14a1efa8f4cfccedc85c7efa317be35c60333 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-12-02 19:52:40 +0300 message: Range Locking: handle TokuDB's DB_LOCK_DEADLOCK, too. --- utilities/transactions/transaction_lock_mgr.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index db856f725..e43d17fd1 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -356,8 +356,9 @@ Status RangeLockMgr::TryRangeLock(PessimisticTransaction* txn, case DB_LOCK_NOTGRANTED: return Status::TimedOut(Status::SubCode::kLockTimeout); case TOKUDB_OUT_OF_LOCKS: - debug_dump_locks(this); return Status::Busy(Status::SubCode::kLockLimit); + case DB_LOCK_DEADLOCK: + return Status::Busy(Status::SubCode::kDeadlock); default: assert(0); return Status::Busy(Status::SubCode::kLockLimit);