mirror of
https://github.com/MariaDB/server.git
synced 2025-07-16 00:42:55 +03:00
4b4db4a8e5
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>
59 lines
2.1 KiB
Plaintext
59 lines
2.1 KiB
Plaintext
include/master-slave.inc
|
|
[connection master]
|
|
call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
|
|
call mtr.add_suppression("WSREP: handlerton rollback failed");
|
|
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;
|
|
SET @@global.slave_domain_parallel_threads = 3;
|
|
SET @old_parallel_mode = @@GLOBAL.slave_parallel_mode;
|
|
CHANGE MASTER TO master_use_gtid=slave_pos;
|
|
connection master;
|
|
CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB;
|
|
INSERT INTO t1 VALUES (1, 0);
|
|
include/save_master_gtid.inc
|
|
connection slave;
|
|
include/start_slave.inc
|
|
include/sync_with_master_gtid.inc
|
|
include/stop_slave.inc
|
|
SET @@global.slave_parallel_mode ='optimistic';
|
|
connection master;
|
|
include/save_master_gtid.inc
|
|
connection slave;
|
|
include/start_slave.inc
|
|
include/sync_with_master_gtid.inc
|
|
include/stop_slave.inc
|
|
connection master;
|
|
include/save_master_gtid.inc
|
|
connection slave;
|
|
SET @@global.slave_parallel_mode ='conservative';
|
|
include/start_slave.inc
|
|
include/sync_with_master_gtid.inc
|
|
include/stop_slave.inc
|
|
include/save_master_gtid.inc
|
|
connection slave;
|
|
SET @@global.slave_parallel_mode = 'optimistic';
|
|
include/start_slave.inc
|
|
include/sync_with_master_gtid.inc
|
|
include/diff_tables.inc [master:t1, slave:t1]
|
|
connection slave;
|
|
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;
|
|
include/save_master_gtid.inc
|
|
connection slave;
|
|
include/sync_with_master_gtid.inc
|
|
connection master;
|
|
include/rpl_end.inc
|