-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDEV-27025 insert-intention lock conflicts with waiting ORDINARY lock
When lock is checked for conflict, ignore other locks on the record if they wait for the requesting transaction. lock_rec_has_to_wait_in_queue() iterates not all locks for the page, but only the locks located before the waiting lock in the queue. So there is some invariant - any lock in the queue can wait only lock which is located before the waiting lock in the queue. In the case when conflicting lock waits for the transaction of requesting lock, we need to place the requesting lock before the waiting lock in the queue to preserve the invariant. That is why we are looking for the first waiting for requesting transation lock and place the new lock just after the last granted requesting transaction lock before the first waiting for requesting transaction lock. Example: trx1 waiting lock, trx1 granted lock, ..., trx2 lock - waiting for trx1 place new lock here -----------------^ There are also implicit locks which are lazily converted to explicit ones, and we need to place the newly created explicit lock to the correct place in a queue. All explicit locks converted from implicit ones are placed just after the last non-waiting lock of the same transaction before the first waiting for the transaction lock. Code review and cleanup was made by Marko Mäkelä.
- Loading branch information
1 parent
1abc476
commit bd03c0e
Showing
7 changed files
with
241 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# | ||
# MDEV-27025 insert-intention lock conflicts with waiting ORDINARY lock | ||
# | ||
CREATE TABLE t (a INT PRIMARY KEY, b INT NOT NULL UNIQUE) ENGINE=InnoDB; | ||
connect prevent_purge,localhost,root,,; | ||
start transaction with consistent snapshot; | ||
connection default; | ||
INSERT INTO t VALUES (20,20); | ||
DELETE FROM t WHERE b = 20; | ||
connect con_ins,localhost,root,,; | ||
SET DEBUG_SYNC = 'row_ins_sec_index_entry_dup_locks_created SIGNAL ins_set_locks WAIT_FOR ins_cont'; | ||
INSERT INTO t VALUES(10, 20); | ||
connect con_del,localhost,root,,; | ||
SET DEBUG_SYNC = 'now WAIT_FOR ins_set_locks'; | ||
SET DEBUG_SYNC = 'lock_wait_suspend_thread_enter SIGNAL del_locked'; | ||
DELETE FROM t WHERE b = 20; | ||
connection default; | ||
SET DEBUG_SYNC = 'now WAIT_FOR del_locked'; | ||
SET DEBUG_SYNC = 'now SIGNAL ins_cont'; | ||
connection con_ins; | ||
disconnect con_ins; | ||
connection con_del; | ||
disconnect con_del; | ||
disconnect prevent_purge; | ||
connection default; | ||
SET DEBUG_SYNC = 'RESET'; | ||
DROP TABLE t; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
--source include/have_innodb.inc | ||
--source include/count_sessions.inc | ||
--source include/have_debug.inc | ||
--source include/have_debug_sync.inc | ||
|
||
--echo # | ||
--echo # MDEV-27025 insert-intention lock conflicts with waiting ORDINARY lock | ||
--echo # | ||
|
||
# The test checks the ability to acquire exclusive record lock if the acquiring | ||
# transaction already holds a shared lock on the record and another transaction | ||
# is waiting for a lock. | ||
|
||
CREATE TABLE t (a INT PRIMARY KEY, b INT NOT NULL UNIQUE) ENGINE=InnoDB; | ||
|
||
--connect(prevent_purge,localhost,root,,) | ||
start transaction with consistent snapshot; | ||
|
||
--connection default | ||
INSERT INTO t VALUES (20,20); | ||
DELETE FROM t WHERE b = 20; | ||
|
||
--connect(con_ins,localhost,root,,) | ||
SET DEBUG_SYNC = 'row_ins_sec_index_entry_dup_locks_created SIGNAL ins_set_locks WAIT_FOR ins_cont'; | ||
send | ||
INSERT INTO t VALUES(10, 20); | ||
|
||
--connect(con_del,localhost,root,,) | ||
SET DEBUG_SYNC = 'now WAIT_FOR ins_set_locks'; | ||
SET DEBUG_SYNC = 'lock_wait_suspend_thread_enter SIGNAL del_locked'; | ||
############################################################################### | ||
# This DELETE creates waiting ORDINARY X-lock for heap_no 2 as the record is | ||
# delete-marked, this lock conflicts with ORDINARY S-lock set by the the last | ||
# INSERT. After the last INSERT creates insert-intention lock on | ||
# heap_no 2, this lock will conflict with waiting ORDINARY X-lock of this | ||
# DELETE, what causes DEADLOCK error for this DELETE. | ||
############################################################################### | ||
send | ||
DELETE FROM t WHERE b = 20; | ||
|
||
--connection default | ||
SET DEBUG_SYNC = 'now WAIT_FOR del_locked'; | ||
SET DEBUG_SYNC = 'now SIGNAL ins_cont'; | ||
|
||
--connection con_ins | ||
--reap | ||
--disconnect con_ins | ||
|
||
--connection con_del | ||
# Without the fix, ER_LOCK_DEADLOCK would be reported here. | ||
--reap | ||
--disconnect con_del | ||
|
||
--disconnect prevent_purge | ||
|
||
--connection default | ||
|
||
SET DEBUG_SYNC = 'RESET'; | ||
DROP TABLE t; | ||
--source include/wait_until_count_sessions.inc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.