mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge 10.10 into 10.11
This commit is contained in:
95
mysql-test/suite/rpl/r/rpl_parallel_autoinc.result
Normal file
95
mysql-test/suite/rpl/r/rpl_parallel_autoinc.result
Normal file
@@ -0,0 +1,95 @@
|
||||
include/master-slave.inc
|
||||
[connection master]
|
||||
MDEV-31482: Lock wait timeout with INSERT-SELECT, autoinc, and statement-based replication
|
||||
include/rpl_connect.inc [creating slave2]
|
||||
include/rpl_connect.inc [creating slave3]
|
||||
connection master;
|
||||
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
||||
CREATE TABLE t1 (a INT PRIMARY KEY AUTO_INCREMENT, b INT, c INT, INDEX (c)) ENGINE=InnoDB;
|
||||
INSERT INTO t1 (b,c) VALUES (0, 1), (0, 1), (0, 2), (0,3), (0, 5), (0, 7), (0, 8);
|
||||
CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
|
||||
INSERT INTO t2 VALUES (10,1), (20,2), (30,3), (40,4), (50,5);
|
||||
CREATE TABLE t3 (a VARCHAR(20) PRIMARY KEY, b INT) ENGINE=InnoDB;
|
||||
INSERT INTO t3 VALUES ('row for T1', 0), ('row for T2', 0), ('row for T3', 0);
|
||||
include/save_master_gtid.inc
|
||||
connection slave;
|
||||
include/sync_with_master_gtid.inc
|
||||
include/stop_slave.inc
|
||||
set @@global.slave_parallel_threads= 3;
|
||||
set @@global.slave_parallel_mode= OPTIMISTIC;
|
||||
set @@global.innodb_lock_wait_timeout= 20;
|
||||
connection master;
|
||||
BEGIN;
|
||||
UPDATE t3 SET b=b+1 where a="row for T1";
|
||||
INSERT INTO t1(b, c) SELECT 1, t2.b FROM t2 WHERE a=10;
|
||||
Warnings:
|
||||
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave
|
||||
COMMIT;
|
||||
DELETE FROM t1 WHERE c >= 4 and c < 6;
|
||||
BEGIN;
|
||||
UPDATE t3 SET b=b+1 where a="row for T3";
|
||||
INSERT INTO t1(b, c) SELECT 3, t2.b FROM t2 WHERE a >= 20 AND a <= 40;
|
||||
Warnings:
|
||||
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave
|
||||
COMMIT;
|
||||
include/save_master_gtid.inc
|
||||
connection slave1;
|
||||
BEGIN;
|
||||
SELECT * FROM t3 WHERE a="row for T1" FOR UPDATE;
|
||||
a b
|
||||
row for T1 0
|
||||
connection slave2;
|
||||
BEGIN;
|
||||
SELECT * FROM t3 WHERE a="row for T3" FOR UPDATE;
|
||||
a b
|
||||
row for T3 0
|
||||
connection slave3;
|
||||
BEGIN;
|
||||
DELETE FROM t2 WHERE a=30;
|
||||
connection slave;
|
||||
include/start_slave.inc
|
||||
connection slave2;
|
||||
ROLLBACK;
|
||||
connection slave1;
|
||||
ROLLBACK;
|
||||
connection slave3;
|
||||
ROLLBACK;
|
||||
connection slave;
|
||||
include/sync_with_master_gtid.inc
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
a b c
|
||||
1 0 1
|
||||
2 0 1
|
||||
3 0 2
|
||||
4 0 3
|
||||
6 0 7
|
||||
7 0 8
|
||||
8 1 1
|
||||
9 3 2
|
||||
10 3 3
|
||||
11 3 4
|
||||
SELECT * FROM t2 ORDER BY a;
|
||||
a b
|
||||
10 1
|
||||
20 2
|
||||
30 3
|
||||
40 4
|
||||
50 5
|
||||
SELECT * FROM t3 ORDER BY a;
|
||||
a b
|
||||
row for T1 1
|
||||
row for T2 0
|
||||
row for T3 1
|
||||
connection master;
|
||||
CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format");
|
||||
DROP TABLE t1, t2, t3;
|
||||
connection slave;
|
||||
include/stop_slave.inc
|
||||
SET @@global.slave_parallel_threads= 0;
|
||||
SET @@global.slave_parallel_mode= optimistic;
|
||||
SET @@global.innodb_lock_wait_timeout= 50;
|
||||
include/start_slave.inc
|
||||
SELECT @@GLOBAL.innodb_autoinc_lock_mode;
|
||||
@@GLOBAL.innodb_autoinc_lock_mode
|
||||
1
|
||||
include/rpl_end.inc
|
51
mysql-test/suite/rpl/r/rpl_parallel_deadlock_victim.result
Normal file
51
mysql-test/suite/rpl/r/rpl_parallel_deadlock_victim.result
Normal file
@@ -0,0 +1,51 @@
|
||||
include/master-slave.inc
|
||||
[connection master]
|
||||
MDEV-31655: Parallel replication deadlock victim preference code erroneously removed
|
||||
connection server_1;
|
||||
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
||||
CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
|
||||
BEGIN;
|
||||
COMMIT;
|
||||
include/save_master_gtid.inc
|
||||
connection server_2;
|
||||
include/sync_with_master_gtid.inc
|
||||
include/stop_slave.inc
|
||||
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
|
||||
SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode;
|
||||
set @@global.slave_parallel_threads= 5;
|
||||
set @@global.slave_parallel_mode= conservative;
|
||||
SET @old_dbug= @@GLOBAL.debug_dbug;
|
||||
SET GLOBAL debug_dbug= "+d,rpl_mdev31655_zero_retries";
|
||||
connection server_1;
|
||||
SET @old_dbug= @@SESSION.debug_dbug;
|
||||
SET SESSION debug_dbug="+d,binlog_force_commit_id";
|
||||
SET @commit_id= 1+1000;
|
||||
SET @commit_id= 2+1000;
|
||||
SET @commit_id= 3+1000;
|
||||
SET @commit_id= 4+1000;
|
||||
SET @commit_id= 5+1000;
|
||||
SET @commit_id= 6+1000;
|
||||
SET @commit_id= 7+1000;
|
||||
SET @commit_id= 8+1000;
|
||||
SET @commit_id= 9+1000;
|
||||
SET @commit_id= 10+1000;
|
||||
SET SESSION debug_dbug= @old_dbug;
|
||||
SELECT COUNT(*), SUM(a*100*b) FROM t1;
|
||||
COUNT(*) SUM(a*100*b)
|
||||
10 225000
|
||||
include/save_master_gtid.inc
|
||||
connection server_2;
|
||||
include/start_slave.inc
|
||||
include/sync_with_master_gtid.inc
|
||||
SET GLOBAL debug_dbug= @old_dbug;
|
||||
SELECT COUNT(*), SUM(a*100*b) FROM t1;
|
||||
COUNT(*) SUM(a*100*b)
|
||||
10 225000
|
||||
connection server_2;
|
||||
include/stop_slave.inc
|
||||
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
|
||||
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
|
||||
include/start_slave.inc
|
||||
connection server_1;
|
||||
DROP TABLE t1;
|
||||
include/rpl_end.inc
|
50
mysql-test/suite/rpl/r/rpl_parallel_deadlock_victim2.result
Normal file
50
mysql-test/suite/rpl/r/rpl_parallel_deadlock_victim2.result
Normal file
@@ -0,0 +1,50 @@
|
||||
include/master-slave.inc
|
||||
[connection master]
|
||||
connection master;
|
||||
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
||||
CREATE TABLE t1(a INT) ENGINE=INNODB;
|
||||
INSERT INTO t1 VALUES(1);
|
||||
include/save_master_gtid.inc
|
||||
connection slave;
|
||||
include/sync_with_master_gtid.inc
|
||||
include/stop_slave.inc
|
||||
set @@global.slave_parallel_threads= 2;
|
||||
set @@global.slave_parallel_mode= OPTIMISTIC;
|
||||
set @@global.slave_transaction_retries= 2;
|
||||
*** MDEV-28776: rpl.rpl_mark_optimize_tbl_ddl fails with timeout on sync_with_master
|
||||
connection master;
|
||||
SET @@gtid_seq_no= 100;
|
||||
INSERT INTO t1 SELECT 1+a FROM t1;
|
||||
SET @@gtid_seq_no= 200;
|
||||
INSERT INTO t1 SELECT 2+a FROM t1;
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
a
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
include/save_master_gtid.inc
|
||||
connection slave;
|
||||
SET @save_dbug= @@GLOBAL.debug_dbug;
|
||||
SET GLOBAL debug_dbug="+d,rpl_parallel_delay_gtid_0_x_100_start";
|
||||
SET GLOBAL debug_dbug="+d,rpl_write_record_small_sleep_gtid_100_200";
|
||||
SET GLOBAL debug_dbug="+d,small_sleep_after_lock_wait";
|
||||
SET GLOBAL debug_dbug="+d,rpl_delay_deadlock_kill";
|
||||
include/start_slave.inc
|
||||
include/sync_with_master_gtid.inc
|
||||
SET GLOBAL debug_dbug= @save_dbug;
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
a
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
connection slave;
|
||||
include/stop_slave.inc
|
||||
SET @@global.slave_parallel_threads= 0;
|
||||
SET @@global.slave_parallel_mode= optimistic;
|
||||
SET @@global.slave_transaction_retries= 10;
|
||||
include/start_slave.inc
|
||||
connection master;
|
||||
DROP TABLE t1;
|
||||
include/rpl_end.inc
|
140
mysql-test/suite/rpl/t/rpl_parallel_autoinc.test
Normal file
140
mysql-test/suite/rpl/t/rpl_parallel_autoinc.test
Normal file
@@ -0,0 +1,140 @@
|
||||
--source include/have_binlog_format_statement.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/master-slave.inc
|
||||
|
||||
--echo MDEV-31482: Lock wait timeout with INSERT-SELECT, autoinc, and statement-based replication
|
||||
|
||||
# The scenario is transactions T1, T2, T3:
|
||||
#
|
||||
# T1 is waiting for T3 on an autoinc lock
|
||||
# T2 is waiting for T1 to commit
|
||||
# T3 is waiting on a normal row lock held by T2
|
||||
#
|
||||
# This caused a hang until innodb_lock_wait_timeout, because autoinc
|
||||
# locks were not reported to the in-order parallel replication, so T3
|
||||
# was not deadlock killed.
|
||||
|
||||
--let $lock_wait_timeout=20
|
||||
|
||||
--let $rpl_connection_name= slave2
|
||||
--let $rpl_server_number= 2
|
||||
--source include/rpl_connect.inc
|
||||
|
||||
--let $rpl_connection_name= slave3
|
||||
--let $rpl_server_number= 2
|
||||
--source include/rpl_connect.inc
|
||||
|
||||
--connection master
|
||||
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
||||
|
||||
# A table as destination for INSERT-SELECT
|
||||
CREATE TABLE t1 (a INT PRIMARY KEY AUTO_INCREMENT, b INT, c INT, INDEX (c)) ENGINE=InnoDB;
|
||||
INSERT INTO t1 (b,c) VALUES (0, 1), (0, 1), (0, 2), (0,3), (0, 5), (0, 7), (0, 8);
|
||||
|
||||
# A table as source for INSERT-SELECT.
|
||||
CREATE TABLE t2 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
|
||||
INSERT INTO t2 VALUES (10,1), (20,2), (30,3), (40,4), (50,5);
|
||||
|
||||
# A table to help order slave worker threads to setup the desired scenario.
|
||||
CREATE TABLE t3 (a VARCHAR(20) PRIMARY KEY, b INT) ENGINE=InnoDB;
|
||||
INSERT INTO t3 VALUES ('row for T1', 0), ('row for T2', 0), ('row for T3', 0);
|
||||
--source include/save_master_gtid.inc
|
||||
|
||||
--connection slave
|
||||
--source include/sync_with_master_gtid.inc
|
||||
--source include/stop_slave.inc
|
||||
--let $save_innodb_lock_wait_timeout= `SELECT @@global.innodb_lock_wait_timeout`
|
||||
--let $save_slave_parallel_threads= `SELECT @@global.slave_parallel_threads`
|
||||
--let $save_slave_parallel_mode= `SELECT @@global.slave_parallel_mode`
|
||||
set @@global.slave_parallel_threads= 3;
|
||||
set @@global.slave_parallel_mode= OPTIMISTIC;
|
||||
eval set @@global.innodb_lock_wait_timeout= $lock_wait_timeout;
|
||||
|
||||
--connection master
|
||||
# Transaction T1.
|
||||
BEGIN;
|
||||
UPDATE t3 SET b=b+1 where a="row for T1";
|
||||
INSERT INTO t1(b, c) SELECT 1, t2.b FROM t2 WHERE a=10;
|
||||
COMMIT;
|
||||
|
||||
# Transaction T2.
|
||||
DELETE FROM t1 WHERE c >= 4 and c < 6;
|
||||
|
||||
# Transaction T3.
|
||||
BEGIN;
|
||||
UPDATE t3 SET b=b+1 where a="row for T3";
|
||||
INSERT INTO t1(b, c) SELECT 3, t2.b FROM t2 WHERE a >= 20 AND a <= 40;
|
||||
COMMIT;
|
||||
|
||||
--source include/save_master_gtid.inc
|
||||
|
||||
--connection slave1
|
||||
# Temporarily block T1 to create the scheduling that triggers the bug.
|
||||
BEGIN;
|
||||
SELECT * FROM t3 WHERE a="row for T1" FOR UPDATE;
|
||||
|
||||
--connection slave2
|
||||
# Temporarily block T3 from starting (so T2 can reach commit).
|
||||
BEGIN;
|
||||
SELECT * FROM t3 WHERE a="row for T3" FOR UPDATE;
|
||||
|
||||
--connection slave3
|
||||
# This critical step blocks T3 after it has inserted its first row,
|
||||
# and thus taken the auto-increment lock, but before it has reached
|
||||
# the point where it gets a row lock wait on T2. Even though
|
||||
# auto-increment lock waits were not reported due to the bug,
|
||||
# transitive lock waits (T1 waits on autoinc of T3 which waits on row
|
||||
# on T2) _were_ reported as T1 waiting on T2, and thus a deadlock kill
|
||||
# happened and the bug was not triggered.
|
||||
BEGIN;
|
||||
DELETE FROM t2 WHERE a=30;
|
||||
|
||||
--connection slave
|
||||
--source include/start_slave.inc
|
||||
|
||||
# First let T2 complete until it is waiting for T1 to commit.
|
||||
--let $wait_condition= SELECT count(*)=1 FROM information_schema.processlist WHERE state='Waiting for prior transaction to commit' and command LIKE 'Slave_worker';
|
||||
--source include/wait_condition.inc
|
||||
|
||||
# Then let T3 reach the point where it has obtained the autoinc lock,
|
||||
# but it is not yet waiting for a row lock held by T2.
|
||||
--connection slave2
|
||||
ROLLBACK;
|
||||
--let $wait_condition= SELECT count(*)=1 FROM information_schema.processlist WHERE state='Sending data' and info LIKE 'INSERT INTO t1(b, c) SELECT 3, t2.b%' and time_ms > 500 and command LIKE 'Slave_worker';
|
||||
--source include/wait_condition.inc
|
||||
|
||||
# Now let T1 continue, while T3 is holding the autoinc lock but before
|
||||
# it is waiting for T2. Wait a short while to give the hang a chance to
|
||||
# happen; T1 needs to get to request the autoinc lock before we let T3
|
||||
# continue. (There's a small chance the sleep will be too small, which will
|
||||
# let the test occasionally pass on non-fixed server).
|
||||
--connection slave1
|
||||
ROLLBACK;
|
||||
--sleep 0.5
|
||||
|
||||
# Now let T3 continue; the bug was that this lead to an undetected
|
||||
# deadlock that remained until innodb lock wait timeout.
|
||||
--connection slave3
|
||||
ROLLBACK;
|
||||
|
||||
--connection slave
|
||||
--let $slave_timeout= `SELECT $lock_wait_timeout/2`
|
||||
--source include/sync_with_master_gtid.inc
|
||||
--let $slave_timeout=
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
SELECT * FROM t2 ORDER BY a;
|
||||
SELECT * FROM t3 ORDER BY a;
|
||||
|
||||
# Cleanup.
|
||||
--connection master
|
||||
CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format");
|
||||
DROP TABLE t1, t2, t3;
|
||||
|
||||
--connection slave
|
||||
--source include/stop_slave.inc
|
||||
eval SET @@global.slave_parallel_threads= $save_slave_parallel_threads;
|
||||
eval SET @@global.slave_parallel_mode= $save_slave_parallel_mode;
|
||||
eval SET @@global.innodb_lock_wait_timeout= $save_innodb_lock_wait_timeout;
|
||||
--source include/start_slave.inc
|
||||
SELECT @@GLOBAL.innodb_autoinc_lock_mode;
|
||||
--source include/rpl_end.inc
|
86
mysql-test/suite/rpl/t/rpl_parallel_deadlock_victim.test
Normal file
86
mysql-test/suite/rpl/t/rpl_parallel_deadlock_victim.test
Normal file
@@ -0,0 +1,86 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_debug.inc
|
||||
--source include/master-slave.inc
|
||||
|
||||
|
||||
--echo MDEV-31655: Parallel replication deadlock victim preference code erroneously removed
|
||||
# The problem was that InnoDB would choose the wrong deadlock victim.
|
||||
# Create a lot of transactions that can cause deadlocks, and use error
|
||||
# injection to check that the first transactions in each group is never
|
||||
# selected as deadlock victim.
|
||||
--let $rows= 10
|
||||
--let $transactions= 5
|
||||
--let $gcos= 10
|
||||
|
||||
--connection server_1
|
||||
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
||||
CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
|
||||
BEGIN;
|
||||
--disable_query_log
|
||||
--let $i= 0
|
||||
while ($i < 10) {
|
||||
eval INSERT INTO t1 VALUES ($i, 0);
|
||||
inc $i;
|
||||
}
|
||||
--enable_query_log
|
||||
COMMIT;
|
||||
--source include/save_master_gtid.inc
|
||||
|
||||
--connection server_2
|
||||
--source include/sync_with_master_gtid.inc
|
||||
--source include/stop_slave.inc
|
||||
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
|
||||
SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode;
|
||||
eval set @@global.slave_parallel_threads= $transactions;
|
||||
set @@global.slave_parallel_mode= conservative;
|
||||
SET @old_dbug= @@GLOBAL.debug_dbug;
|
||||
# This error injection will allow no retries for GTIDs divisible by 1000.
|
||||
SET GLOBAL debug_dbug= "+d,rpl_mdev31655_zero_retries";
|
||||
|
||||
--connection server_1
|
||||
SET @old_dbug= @@SESSION.debug_dbug;
|
||||
SET SESSION debug_dbug="+d,binlog_force_commit_id";
|
||||
|
||||
--let $j= 1
|
||||
while ($j <= $gcos) {
|
||||
eval SET @commit_id= $j+1000;
|
||||
--let $i= 0
|
||||
while ($i < $transactions) {
|
||||
--disable_query_log
|
||||
eval SET SESSION gtid_seq_no= 1000 + 1000*$j + $i;
|
||||
BEGIN;
|
||||
--let $k= 0
|
||||
while ($k < $rows) {
|
||||
eval UPDATE t1 SET b=b+1 WHERE a=(($i+$k) MOD $rows);
|
||||
inc $k;
|
||||
}
|
||||
COMMIT;
|
||||
--enable_query_log
|
||||
inc $i;
|
||||
}
|
||||
inc $j;
|
||||
}
|
||||
|
||||
SET SESSION debug_dbug= @old_dbug;
|
||||
SELECT COUNT(*), SUM(a*100*b) FROM t1;
|
||||
|
||||
--source include/save_master_gtid.inc
|
||||
|
||||
--connection server_2
|
||||
--source include/start_slave.inc
|
||||
--source include/sync_with_master_gtid.inc
|
||||
SET GLOBAL debug_dbug= @old_dbug;
|
||||
SELECT COUNT(*), SUM(a*100*b) FROM t1;
|
||||
|
||||
|
||||
# Clean up.
|
||||
--connection server_2
|
||||
--source include/stop_slave.inc
|
||||
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
|
||||
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
|
||||
--source include/start_slave.inc
|
||||
|
||||
--connection server_1
|
||||
DROP TABLE t1;
|
||||
|
||||
--source include/rpl_end.inc
|
83
mysql-test/suite/rpl/t/rpl_parallel_deadlock_victim2.test
Normal file
83
mysql-test/suite/rpl/t/rpl_parallel_deadlock_victim2.test
Normal file
@@ -0,0 +1,83 @@
|
||||
--source include/master-slave.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_debug.inc
|
||||
--source include/have_binlog_format_statement.inc
|
||||
|
||||
--connection master
|
||||
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
||||
CREATE TABLE t1(a INT) ENGINE=INNODB;
|
||||
INSERT INTO t1 VALUES(1);
|
||||
--source include/save_master_gtid.inc
|
||||
|
||||
--connection slave
|
||||
--source include/sync_with_master_gtid.inc
|
||||
--source include/stop_slave.inc
|
||||
--let $save_transaction_retries= `SELECT @@global.slave_transaction_retries`
|
||||
--let $save_slave_parallel_threads= `SELECT @@global.slave_parallel_threads`
|
||||
--let $save_slave_parallel_mode= `SELECT @@global.slave_parallel_mode`
|
||||
set @@global.slave_parallel_threads= 2;
|
||||
set @@global.slave_parallel_mode= OPTIMISTIC;
|
||||
set @@global.slave_transaction_retries= 2;
|
||||
|
||||
--echo *** MDEV-28776: rpl.rpl_mark_optimize_tbl_ddl fails with timeout on sync_with_master
|
||||
# This was a failure where a transaction T1 could deadlock multiple times
|
||||
# with T2, eventually exceeding the default --slave-transaction-retries=10.
|
||||
# Root cause was MDEV-31655, causing InnoDB to wrongly choose T1 as deadlock
|
||||
# victim over T2. If thread scheduling is right, it was possible for T1 to
|
||||
# repeatedly deadlock, roll back, and have time to grab an S lock again before
|
||||
# T2 woke up and got its waiting X lock, thus repeating the same deadlock over
|
||||
# and over.
|
||||
# Once the bug is fixed, it is not possible to re-create the same execution
|
||||
# and thread scheduling. Instead we inject small sleeps in a way that
|
||||
# triggered the problem when the bug was there, to demonstrate that the
|
||||
# problem no longer occurs.
|
||||
|
||||
--connection master
|
||||
# T1
|
||||
SET @@gtid_seq_no= 100;
|
||||
INSERT INTO t1 SELECT 1+a FROM t1;
|
||||
# T2
|
||||
SET @@gtid_seq_no= 200;
|
||||
INSERT INTO t1 SELECT 2+a FROM t1;
|
||||
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
--source include/save_master_gtid.inc
|
||||
|
||||
--connection slave
|
||||
SET @save_dbug= @@GLOBAL.debug_dbug;
|
||||
|
||||
# Inject various delays to hint thread scheduling to happen in the way that
|
||||
# triggered MDEV-28776.
|
||||
|
||||
# Small delay starting T1 so it will be the youngest trx and be chosen over
|
||||
# T2 as the deadlock victim by default in InnoDB.
|
||||
SET GLOBAL debug_dbug="+d,rpl_parallel_delay_gtid_0_x_100_start";
|
||||
|
||||
# Small delay before taking insert X lock to give time for both T1 and T2 to
|
||||
# get the S lock first and cause a deadlock.
|
||||
SET GLOBAL debug_dbug="+d,rpl_write_record_small_sleep_gtid_100_200";
|
||||
|
||||
# Small delay after T2's wait on the X lock, to give time for T1 retry to
|
||||
# re-aquire the T1 S lock first.
|
||||
SET GLOBAL debug_dbug="+d,small_sleep_after_lock_wait";
|
||||
|
||||
# Delay deadlock kill of T2.
|
||||
SET GLOBAL debug_dbug="+d,rpl_delay_deadlock_kill";
|
||||
|
||||
--source include/start_slave.inc
|
||||
--source include/sync_with_master_gtid.inc
|
||||
SET GLOBAL debug_dbug= @save_dbug;
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
|
||||
# Cleanup.
|
||||
--connection slave
|
||||
--source include/stop_slave.inc
|
||||
eval SET @@global.slave_parallel_threads= $save_slave_parallel_threads;
|
||||
eval SET @@global.slave_parallel_mode= $save_slave_parallel_mode;
|
||||
eval SET @@global.slave_transaction_retries= $save_transaction_retries;
|
||||
--source include/start_slave.inc
|
||||
|
||||
--connection master
|
||||
DROP TABLE t1;
|
||||
|
||||
--source include/rpl_end.inc
|
Reference in New Issue
Block a user