mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
bead24b7f3
Remove one of the major sources of race condiitons in mariadb-test. Normally, mariadb_close() sends COM_QUIT to the server and immediately disconnects. In mariadb-test it means the test can switch to another connection and sends queries to the server before the server even started parsing the COM_QUIT packet and these queries can see the connection as fully active, as it didn't reach dispatch_command yet. This is a major source of instability in tests and many - but not all, still less than a half - tests employ workarounds. The correct one is a pair count_sessions.inc/wait_until_count_sessions.inc. Also very popular was wait_until_disconnected.inc, which was completely useless, because it verifies that the connection is closed, and after disconnect it always is, it didn't verify whether the server processed COM_QUIT. Sadly the placebo was as widely used as the real thing. Let's fix this by making mariadb-test `disconnect` command _to wait_ for the server to confirm. This makes almost all workarounds redundant. In some cases count_sessions.inc/wait_until_count_sessions.inc is still needed, though, as only `disconnect` command is changed: * after external tools, like `exec $MYSQL` * after failed `connect` command * replication, after `STOP SLAVE` * Federated/CONNECT/SPIDER/etc after `DROP TABLE` and also in some XA tests, because an XA transaction is dissociated from the THD very late, after the server has closed the client connection. Collateral cleanups: fix comments, remove some redundant statements: * DROP IF EXISTS if nothing is known to exist * DROP table/view before DROP DATABASE * REVOKE privileges before DROP USER etc
226 lines
6.3 KiB
Plaintext
226 lines
6.3 KiB
Plaintext
--source include/have_innodb.inc
|
|
--source include/have_debug.inc
|
|
--source include/have_debug_sync.inc
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
connect stop_purge,localhost,root;
|
|
START TRANSACTION WITH CONSISTENT SNAPSHOT;
|
|
|
|
--connect (con1,localhost,root,,)
|
|
--connect (con2,localhost,root,,)
|
|
--connect (con3,localhost,root,,)
|
|
|
|
--connection default
|
|
CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
|
|
INSERT INTO t1 (id) VALUES (1);
|
|
|
|
--echo # Simplest scenario:
|
|
--echo # <con1, S, granted>,
|
|
--echo # <con1, S, granted>, <con2, X, waiting for con1>,
|
|
--echo # Before MDEV-34877:
|
|
--echo # <con1, S, granted>, <con2, X, waiting for con1>, <con1, X, waiting for con1>
|
|
--echo # After MDEV-34877:
|
|
--echo # <con1, S, granted>, <con1, X, granted>, <con2, X, waiting for con1>
|
|
--echo # Expected: instead of deadlocking, the con1's request should ignore con2's
|
|
|
|
--connection con1
|
|
BEGIN;
|
|
SELECT * FROM t1 LOCK IN SHARE MODE;
|
|
|
|
--connection con2
|
|
BEGIN;
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con2_will_wait';
|
|
--send SELECT * FROM t1 FOR UPDATE
|
|
|
|
--connection con1
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con2_will_wait';
|
|
SELECT * FROM t1 FOR UPDATE;
|
|
COMMIT;
|
|
|
|
--connection con2
|
|
--reap
|
|
COMMIT;
|
|
|
|
--echo # The scenario when we bypass X<-S pair:
|
|
--echo # <con1, S, granted>,
|
|
--echo # <con1, S, granted>, <con2, X, waiting for con1>,
|
|
--echo # <con1, S, granted>, <con2, X, waiting for con1>, <con3, S, waiting for con2>
|
|
--echo # <con1, S, granted>, <con1, X, granted>, <con2, X, waiting for con1>, <con3, S, waiting for con2>
|
|
|
|
--connection con1
|
|
BEGIN;
|
|
SELECT * FROM t1 LOCK IN SHARE MODE;
|
|
|
|
--connection con2
|
|
BEGIN;
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con2_will_wait';
|
|
--send SELECT * FROM t1 FOR UPDATE
|
|
|
|
--connection con3
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con2_will_wait';
|
|
BEGIN;
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con3_will_wait';
|
|
--send SELECT * FROM t1 LOCK IN SHARE MODE;
|
|
|
|
--connection con1
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con3_will_wait';
|
|
SELECT * FROM t1 FOR UPDATE;
|
|
COMMIT;
|
|
|
|
--connection con2
|
|
--reap
|
|
COMMIT;
|
|
|
|
--connection con3
|
|
--reap
|
|
COMMIT;
|
|
|
|
#
|
|
--echo # A variant of the above scenario:
|
|
--echo # <con1, X REC_NOT_GAP, granted>,
|
|
--echo # <con1, X REC_NOT_GAP, granted>, <con2, S, waiting for con1>,
|
|
--echo # <con1, X REC_NOT_GAP, granted>, <con2, S, waiting for con1>, <con1, INSERT INTENTION, waiting for con1>
|
|
--echo # Expected: a deadlock, as INSERT INTENTION should not overtake locks on gap, to not slice them
|
|
--connection con1
|
|
BEGIN;
|
|
SELECT * FROM t1 WHERE id=1 FOR UPDATE;
|
|
|
|
--connection con2
|
|
BEGIN;
|
|
SET DEBUG_SYNC = 'lock_wait_start SIGNAL con2_will_wait';
|
|
--send SELECT * FROM t1 LOCK IN SHARE MODE
|
|
|
|
--connection con1
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con2_will_wait';
|
|
INSERT INTO t1 VALUES (0);
|
|
ROLLBACK;
|
|
|
|
--connection con2
|
|
--error ER_LOCK_DEADLOCK
|
|
--reap
|
|
COMMIT;
|
|
|
|
--echo # More complicated scenario:
|
|
--echo # <con1, S, granted>,
|
|
--echo # <con1, S, granted>, <con2, S REC_NOT_GAP, granted>,
|
|
--echo # <con1, S, granted>, <con2, S REC_NOT_GAP, granted>, <con3, X, waiting for con1>
|
|
--echo # <con1, S, granted>, <con2, S REC_NOT_GAP, granted>, <con3, X, waiting for con1>, <con1, INSERT_INTENTION, waiting for con3>
|
|
--echo # <con1, S, granted>, <con3, X, waiting for con1>, <con1, INSERT_INTENTION, waiting for con3>
|
|
--echo # Expected: a deadlock, as INSERT INTENTION should not overtake locks on gap, to not slice them
|
|
|
|
--connection con1
|
|
BEGIN;
|
|
SELECT * FROM t1 LOCK IN SHARE MODE;
|
|
|
|
--connection con2
|
|
BEGIN;
|
|
SELECT * FROM t1 WHERE id=1 LOCK IN SHARE MODE;
|
|
|
|
--connection con3
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con3_will_wait';
|
|
--send SELECT * FROM t1 FOR UPDATE
|
|
|
|
--connection con1
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con3_will_wait';
|
|
SET DEBUG_SYNC = 'lock_wait_start SIGNAL con1_will_wait';
|
|
--send INSERT INTO t1 VALUES (0)
|
|
|
|
--connection con2
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con1_will_wait';
|
|
COMMIT;
|
|
|
|
--connection con1
|
|
--reap
|
|
ROLLBACK;
|
|
|
|
--connection con3
|
|
--error ER_LOCK_DEADLOCK
|
|
--reap
|
|
|
|
--echo # More complicated scenario.
|
|
--echo # <con1, S, granted>,
|
|
--echo # <con1, S, granted>, <con2, S REC_NOT_GAP, granted>,
|
|
--echo # <con1, S, granted>, <con2, S REC_NOT_GAP, granted>, <con3, X, waiting for con1>
|
|
--echo # <con1, S, granted>, <con2, S REC_NOT_GAP, granted>, <con3, X, waiting for con1>, <con1, X REC_NOT_GAP, waiting for con2>
|
|
--echo # Before MDEV-34877:
|
|
--echo # <con1, S, granted>, <con3, X, waiting for con1>, <con1, X REC_NOT_GAP, waiting for con3>
|
|
--echo # After MDEV-34877:
|
|
--echo # <con1, S, granted>, <con1, X REC_NOT_GAP, granted>, <con3, X, waiting for con1>
|
|
|
|
|
|
--connection con1
|
|
BEGIN;
|
|
SELECT * FROM t1 LOCK IN SHARE MODE;
|
|
|
|
--connection con2
|
|
BEGIN;
|
|
SELECT * FROM t1 WHERE id=1 LOCK IN SHARE MODE;
|
|
|
|
--connection default
|
|
|
|
--connection con3
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con3_will_wait';
|
|
--send SELECT * FROM t1 FOR UPDATE
|
|
|
|
--connection con1
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con3_will_wait';
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con1_will_wait';
|
|
--send SELECT * FROM t1 WHERE id=1 FOR UPDATE
|
|
|
|
--connection con2
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con1_will_wait';
|
|
COMMIT;
|
|
|
|
--connection con1
|
|
--reap
|
|
COMMIT;
|
|
|
|
--connection con3
|
|
--reap
|
|
COMMIT;
|
|
|
|
--echo # A scenario, where con1 has to bypass two transactions:
|
|
--echo # <con1, S, granted>
|
|
--echo # <con1, S, granted> <con2, X, waiting>
|
|
--echo # <con1, S, granted> <con2, X, waiting> <con3, X, waiting>
|
|
--echo # Before MDEV-34877:
|
|
--echo # <con1, S, granted> <con2, X, waiting> <con3, X, waiting> <con1, X REC_NOT_GAP, waiting for con2>
|
|
--echo # After MDEV-34877:
|
|
--echo # <con1, S, granted> <con1, X REC_NOT_GAP, granted> <con2, X, waiting> <con3, X, waiting>
|
|
--connection con1
|
|
BEGIN;
|
|
SELECT * FROM t1 LOCK IN SHARE MODE;
|
|
|
|
--connection con2
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con2_will_wait';
|
|
--send SELECT * FROM t1 FOR UPDATE
|
|
|
|
--connection con3
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con2_will_wait';
|
|
SET DEBUG_SYNC = 'lock_wait_before_suspend SIGNAL con3_will_wait';
|
|
--send SELECT * FROM t1 FOR UPDATE
|
|
|
|
--connection con1
|
|
SET DEBUG_SYNC = 'now WAIT_FOR con3_will_wait';
|
|
SELECT * FROM t1 WHERE id=1 FOR UPDATE;
|
|
COMMIT;
|
|
|
|
--connection con2
|
|
--reap
|
|
COMMIT;
|
|
|
|
--connection con3
|
|
--reap
|
|
COMMIT;
|
|
|
|
--connection default
|
|
--disconnect con1
|
|
--disconnect con2
|
|
--disconnect con3
|
|
--disconnect stop_purge
|
|
|
|
DROP TABLE t1;
|