mirror of
https://github.com/MariaDB/server.git
synced 2025-02-09 23:24:11 +01:00
066f920484
This is an extension of MDEV-30423 "Deadlock on Replica during BACKUP STAGE BLOCK_COMMIT on XA transactions" The original commit in MDEV-30423 was not complete as some usage in XA of MDL_BACKUP_COMMIT locks did not set thd->backup_commit_lock. This is required to be set when using parallel replication. Fixed by ensuring that all usage of BACKUP_COMMIT lock i XA is uniform and all sets thd->backup_commit_lock. I also changed all locks to be MDL_EXPLICIT to keep also that part uniform. A regression test is added.
42 lines
1.1 KiB
Text
42 lines
1.1 KiB
Text
include/master-slave.inc
|
|
[connection master]
|
|
connection master;
|
|
CREATE TABLE t (a INT) ENGINE = innodb;
|
|
connection slave;
|
|
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= 2;
|
|
SET @@global.slave_parallel_mode = 'optimistic';
|
|
connection master;
|
|
# MDEV-35110
|
|
SET @@gtid_seq_no=100;
|
|
insert into t set a=1;
|
|
xa start 'x';
|
|
insert into t set a=2;
|
|
xa end 'x';
|
|
xa prepare 'x';
|
|
connection slave;
|
|
SET @@global.debug_dbug="+d,hold_worker_on_schedule";
|
|
start slave;
|
|
connection slave1;
|
|
backup stage start;
|
|
backup stage block_commit;
|
|
connection slave;
|
|
SET debug_sync = 'now SIGNAL continue_worker';
|
|
SET debug_sync = RESET;
|
|
connection slave1;
|
|
backup stage end;
|
|
connection master;
|
|
xa rollback 'x';
|
|
connection slave;
|
|
# Clean up.
|
|
connection slave;
|
|
include/stop_slave.inc
|
|
SET @@global.debug_dbug="";
|
|
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 t;
|
|
include/rpl_end.inc
|