mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-34042: Deadlock kill of XA PREPARE can break replication / rpl.rpl_parallel_multi_domain_xa sporadic failure
Refinement of the original patch. Move the code to reset the kill up into the parent class Xid_apply_log_event, to also fix the similar issue for XA COMMIT. Increase the number of slave retries in the test case rpl.rpl_parallel_multi_domain_xa to fix some sporadic failures. The test generates massive amounts of conflicting transactions in multiple independent domains, which can cause multiple rollback+retry for a transaction as it conflicts with transactions in other domains one-by-one. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
@@ -6,6 +6,8 @@ connection master;
|
||||
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
||||
connection slave;
|
||||
include/stop_slave.inc
|
||||
SET @old_transaction_retries = @@GLOBAL.slave_transaction_retries;
|
||||
SET @@global.slave_transaction_retries = 1000;
|
||||
SET @old_parallel_threads = @@GLOBAL.slave_parallel_threads;
|
||||
SET @old_slave_domain_parallel_threads = @@GLOBAL.slave_domain_parallel_threads;
|
||||
SET @@global.slave_parallel_threads = 5;
|
||||
@@ -45,6 +47,7 @@ include/stop_slave.inc
|
||||
SET @@global.slave_parallel_mode = @old_parallel_mode;
|
||||
SET @@global.slave_parallel_threads = @old_parallel_threads;
|
||||
SET @@global.slave_domain_parallel_threads = @old_slave_domain_parallel_threads;
|
||||
SET @@global.slave_transaction_retries = @old_transaction_retries;
|
||||
include/start_slave.inc
|
||||
connection master;
|
||||
DROP TABLE t1;
|
||||
|
Reference in New Issue
Block a user