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
99 lines
2.3 KiB
Plaintext
99 lines
2.3 KiB
Plaintext
#
|
|
# wl#9383 INNODB: ADD AN OPTION TO TURN OFF/ON DEADLOCK CHECKER
|
|
#
|
|
|
|
--source include/have_innodb.inc
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
let $have_deadlock=`select @@GLOBAL.innodb_deadlock_detect`;
|
|
|
|
connection default;
|
|
|
|
CREATE TABLE t1(
|
|
id INT,
|
|
PRIMARY KEY(id)
|
|
) ENGINE=InnoDB;
|
|
|
|
CREATE TABLE dl(
|
|
id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT,
|
|
cnt INT UNSIGNED
|
|
) ENGINE=InnoDB;
|
|
|
|
INSERT INTO t1 VALUES(1), (2), (3);
|
|
# Preserve the initial value of the deadlock counter
|
|
INSERT INTO dl(cnt) SELECT variable_value FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_deadlocks';
|
|
|
|
# We are not interested query results, only errors
|
|
--disable_result_log
|
|
BEGIN;
|
|
|
|
SELECT * FROM t1 WHERE id = 1 LOCK IN SHARE MODE;
|
|
|
|
connect (con1,localhost,root,,);
|
|
BEGIN;
|
|
SELECT * FROM t1 WHERE id = 2 LOCK IN SHARE MODE;
|
|
|
|
connect (con2,localhost,root,,);
|
|
BEGIN;
|
|
SELECT * FROM t1 WHERE id = 2 LOCK IN SHARE MODE;
|
|
|
|
send SELECT * FROM t1 WHERE id = 1 FOR UPDATE;
|
|
|
|
connection default;
|
|
send SELECT * FROM t1 WHERE id = 2 FOR UPDATE;
|
|
|
|
connection con2;
|
|
if (!$have_deadlock) {
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
reap;
|
|
disconnect con1;
|
|
}
|
|
if ($have_deadlock) {
|
|
connection con1;
|
|
COMMIT;
|
|
disconnect con1;
|
|
connection con2;
|
|
--error 0,ER_LOCK_DEADLOCK,ER_LOCK_WAIT_TIMEOUT
|
|
reap;
|
|
}
|
|
ROLLBACK;
|
|
disconnect con2;
|
|
|
|
#
|
|
# Note here that con1 is the older transaction as it
|
|
# query started wait first. Thus, con1 gets lock
|
|
# wait timeout first. There is possibility that
|
|
# default connection gets lock timeout also or
|
|
# as con1 is rolled back it gets the locks it waited
|
|
# and does the update.
|
|
#
|
|
connection default;
|
|
--let $valid_deadlock_cnt= 1
|
|
if (!$have_deadlock) {
|
|
--error 0,ER_LOCK_WAIT_TIMEOUT
|
|
reap;
|
|
}
|
|
if ($have_deadlock) {
|
|
--error 0,ER_LOCK_DEADLOCK
|
|
reap;
|
|
--disable_query_log
|
|
INSERT INTO dl(cnt) SELECT variable_value FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_deadlocks';
|
|
set @init_deadlock_cnt = (SELECT min(k.cnt) FROM dl k);
|
|
--let $valid_deadlock_cnt= `SELECT (max(t.cnt-@init_deadlock_cnt) = 1) FROM dl t`
|
|
--enable_query_log
|
|
}
|
|
# Indicates that the deadlock counter works well.
|
|
# Use the default =1 where is no deadlock detection,
|
|
# to enable unconditional check.
|
|
--echo 'Deadlock counter is valid';
|
|
--echo $valid_deadlock_cnt
|
|
|
|
ROLLBACK;
|
|
|
|
--enable_result_log
|
|
DROP TABLE t1;
|
|
DROP TABLE dl;
|