mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
714762ddb7
Description: ============ To change 'CONSERVATIVE' @@global.slave_parallel_mode default to 'OPTIMISTIC' in 10.5. @sql/sys_vars.cc Changed default parallel_mode to 'OPTIMISTIC' @sql/rpl_filter.cc Changed default parallel_mode to 'OPTIMISTIC' @sql/mysqld.cc Removed the initialization of 'SLAVE_PARALLEL_CONSERVATIVE' to 'opt_slave_parallel_mode' variable. @mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test @mysql-test/suite/rpl/t/rpl_mdev6386.test Added 'mtr' suppression to ignore 'ER_PRIOR_COMMIT_FAILED'. In case of 'OPTIMISTIC' mode if a transaction gets killed during "wait_for_prior_commit" it results in above error "1964". Hence suppression needs to be added for this error. @mysql-test/suite/rpl/t/rpl_parallel_conflicts.test Test has a 'slave.opt' which explicitly sets slave_parallel_mode to 'conservative'. When the test ends this mode conflicts with new default mode. Hence check test case reports an error. The 'slave.opt' is removed and options are set and reset within test. @mysql-test/suite/multi_source/info_logs.result @mysql-test/suite/multi_source/reset_slave.result @mysql-test/suite/multi_source/simple.result Result content mismatch in "show slave status" output. This is expected as new slave_parallel_mode='OPTIMISTIC'. @mysql-test/include/check-testcase.test Updated default 'slave_parallel_mode' to 'optimistic'. Refactored rpl_parallel.test into following test cases. Test case 1: @mysql-test/suite/rpl/t/rpl_parallel_domain.test Test case 2: @mysql-test/suite/rpl/t/rpl_parallel_domain_slave_single_grp.test Test case 3: @mysql-test/suite/rpl/t/rpl_parallel_single_grpcmt.test Test case 4: @mysql-test/suite/rpl/t/rpl_parallel_stop_slave.test Test case 5: @mysql-test/suite/rpl/t/rpl_parallel_slave_bgc_kill.test Test case 6: @mysql-test/suite/rpl/t/rpl_parallel_gco_wait_kill.test Test case 7: @mysql-test/suite/rpl/t/rpl_parallel_free_deferred_event.test Test case 8: @mysql-test/suite/rpl/t/rpl_parallel_missed_error_handling.test Test case 9: @mysql-test/suite/rpl/t/rpl_parallel_innodb_lock_conflict.test Test case 10: @mysql-test/suite/rpl/t/rpl_parallel_gtid_slave_pos_update_fail.test Test case 11: @mysql-test/suite/rpl/t/rpl_parallel_wrong_exec_master_pos.test Test case 12: @mysql-test/suite/rpl/t/rpl_parallel_partial_binlog_trans.test Test case 13: @mysql-test/suite/rpl/t/rpl_parallel_ignore_error_on_rotate.test Test case 14: @mysql-test/suite/rpl/t/rpl_parallel_wrong_binlog_order.test Test case 15: @mysql-test/suite/rpl/t/rpl_parallel_incorrect_relay_pos.test Test case 16: @mysql-test/suite/rpl/t/rpl_parallel_retry_deadlock.test Test case 17: @mysql-test/suite/rpl/t/rpl_parallel_deadlock_corrupt_binlog.test Test case 18: @mysql-test/suite/rpl/t/rpl_parallel_mode.test Test case 19: @mysql-test/suite/rpl/t/rpl_parallel_analyze_table_hang.test Test case 20: @mysql-test/suite/rpl/t/rpl_parallel_record_gtid_wakeup.test Test case 21: @mysql-test/suite/rpl/t/rpl_parallel_stop_on_con_kill.test Test case 22: @mysql-test/suite/rpl/t/rpl_parallel_rollback_assert.test
192 lines
5.7 KiB
Text
192 lines
5.7 KiB
Text
*** MDEV-7326 Server deadlock in connection with parallel replication ***
|
|
include/master-slave.inc
|
|
[connection master]
|
|
connection server_2;
|
|
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
|
|
SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode;
|
|
include/stop_slave.inc
|
|
SET GLOBAL slave_parallel_mode='conservative';
|
|
SET GLOBAL slave_parallel_threads=10;
|
|
CHANGE MASTER TO master_use_gtid=slave_pos;
|
|
include/start_slave.inc
|
|
connection server_1;
|
|
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
|
CREATE TABLE t1 (a int PRIMARY KEY) ENGINE=MyISAM;
|
|
CREATE TABLE t2 (a int PRIMARY KEY) ENGINE=InnoDB;
|
|
CREATE TABLE t6 (a INT) ENGINE=MyISAM;
|
|
connection server_2;
|
|
connection server_1;
|
|
SET sql_log_bin=0;
|
|
CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500))
|
|
RETURNS INT DETERMINISTIC
|
|
BEGIN
|
|
RETURN x;
|
|
END
|
|
||
|
|
SET sql_log_bin=1;
|
|
connection server_2;
|
|
SET sql_log_bin=0;
|
|
CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500))
|
|
RETURNS INT DETERMINISTIC
|
|
BEGIN
|
|
IF d1 != '' THEN
|
|
SET debug_sync = d1;
|
|
END IF;
|
|
IF d2 != '' THEN
|
|
SET debug_sync = d2;
|
|
END IF;
|
|
RETURN x;
|
|
END
|
|
||
|
|
SET sql_log_bin=1;
|
|
connection server_2;
|
|
include/stop_slave.inc
|
|
SET GLOBAL slave_parallel_threads=0;
|
|
SET GLOBAL slave_parallel_threads=3;
|
|
SET GLOBAL debug_dbug="+d,rpl_parallel_simulate_temp_err_xid";
|
|
include/start_slave.inc
|
|
connection server_1;
|
|
SET @old_format= @@SESSION.binlog_format;
|
|
SET binlog_format= STATEMENT;
|
|
INSERT INTO t1 VALUES (foo(50,
|
|
"rpl_parallel_start_waiting_for_prior SIGNAL t3_ready",
|
|
"rpl_parallel_end_of_group SIGNAL prep_ready WAIT_FOR prep_cont"));
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now WAIT_FOR prep_ready";
|
|
connection server_1;
|
|
INSERT INTO t2 VALUES (foo(50,
|
|
"rpl_parallel_simulate_temp_err_xid SIGNAL t1_ready1 WAIT_FOR t1_cont1",
|
|
"rpl_parallel_retry_after_unmark SIGNAL t1_ready2 WAIT_FOR t1_cont2"));
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now WAIT_FOR t1_ready1";
|
|
connection server_1;
|
|
INSERT INTO t1 VALUES (foo(51,
|
|
"rpl_parallel_before_mark_start_commit SIGNAL t2_ready1 WAIT_FOR t2_cont1",
|
|
"rpl_parallel_after_mark_start_commit SIGNAL t2_ready2"));
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now WAIT_FOR t2_ready1";
|
|
SET DEBUG_SYNC= "now SIGNAL t1_cont1";
|
|
SET DEBUG_SYNC= "now WAIT_FOR t1_ready2";
|
|
connection server_1;
|
|
INSERT INTO t1 VALUES (52);
|
|
SET BINLOG_FORMAT= @old_format;
|
|
SELECT * FROM t2 WHERE a>=50 ORDER BY a;
|
|
a
|
|
50
|
|
SELECT * FROM t1 WHERE a>=50 ORDER BY a;
|
|
a
|
|
50
|
|
51
|
|
52
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now SIGNAL prep_cont";
|
|
SET DEBUG_SYNC= "now WAIT_FOR t3_ready";
|
|
SET DEBUG_SYNC= "now SIGNAL t2_cont1";
|
|
SET DEBUG_SYNC= "now WAIT_FOR t2_ready2";
|
|
SET DEBUG_SYNC= "now SIGNAL t1_cont2";
|
|
connection server_1;
|
|
connection server_2;
|
|
SELECT * FROM t2 WHERE a>=50 ORDER BY a;
|
|
a
|
|
50
|
|
SELECT * FROM t1 WHERE a>=50 ORDER BY a;
|
|
a
|
|
50
|
|
51
|
|
52
|
|
SET DEBUG_SYNC="reset";
|
|
include/stop_slave.inc
|
|
SET GLOBAL debug_dbug=@old_dbug;
|
|
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
|
|
SET GLOBAL slave_parallel_threads=0;
|
|
SET GLOBAL slave_parallel_threads=10;
|
|
include/start_slave.inc
|
|
*** MDEV-7326 Server deadlock in connection with parallel replication ***
|
|
connect con_temp3,127.0.0.1,root,,test,$SERVER_MYPORT_1,;
|
|
connect con_temp4,127.0.0.1,root,,test,$SERVER_MYPORT_1,;
|
|
connection server_2;
|
|
include/stop_slave.inc
|
|
SET @old_parallel_mode= @@GLOBAL.slave_parallel_mode;
|
|
SET GLOBAL slave_parallel_mode='conservative';
|
|
SET GLOBAL slave_parallel_threads=0;
|
|
SET GLOBAL slave_parallel_threads=3;
|
|
SET GLOBAL debug_dbug="+d,rpl_parallel_simulate_temp_err_xid";
|
|
include/start_slave.inc
|
|
connection server_1;
|
|
SET @old_format= @@SESSION.binlog_format;
|
|
SET binlog_format= STATEMENT;
|
|
INSERT INTO t1 VALUES (foo(60,
|
|
"rpl_parallel_start_waiting_for_prior SIGNAL t3_ready",
|
|
"rpl_parallel_end_of_group SIGNAL prep_ready WAIT_FOR prep_cont"));
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now WAIT_FOR prep_ready";
|
|
connection server_1;
|
|
INSERT INTO t2 VALUES (foo(60,
|
|
"rpl_parallel_simulate_temp_err_xid SIGNAL t1_ready1 WAIT_FOR t1_cont1",
|
|
"rpl_parallel_retry_after_unmark SIGNAL t1_ready2 WAIT_FOR t1_cont2"));
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now WAIT_FOR t1_ready1";
|
|
connection con_temp3;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1';
|
|
SET binlog_format=statement;
|
|
INSERT INTO t1 VALUES (foo(61,
|
|
"rpl_parallel_before_mark_start_commit SIGNAL t2_ready1 WAIT_FOR t2_cont1",
|
|
"rpl_parallel_after_mark_start_commit SIGNAL t2_ready2"));
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued1';
|
|
connection con_temp4;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued2';
|
|
INSERT INTO t6 VALUES (62);
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued2';
|
|
SET debug_sync='now SIGNAL master_cont1';
|
|
connection con_temp3;
|
|
connection con_temp4;
|
|
connection server_1;
|
|
SET debug_sync='RESET';
|
|
SET BINLOG_FORMAT= @old_format;
|
|
SELECT * FROM t2 WHERE a>=60 ORDER BY a;
|
|
a
|
|
60
|
|
SELECT * FROM t1 WHERE a>=60 ORDER BY a;
|
|
a
|
|
60
|
|
61
|
|
SELECT * FROM t6 WHERE a>=60 ORDER BY a;
|
|
a
|
|
62
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now WAIT_FOR t2_ready1";
|
|
SET DEBUG_SYNC= "now SIGNAL t1_cont1";
|
|
SET DEBUG_SYNC= "now WAIT_FOR t1_ready2";
|
|
connection server_2;
|
|
SET DEBUG_SYNC= "now SIGNAL prep_cont";
|
|
SET DEBUG_SYNC= "now WAIT_FOR t3_ready";
|
|
SET DEBUG_SYNC= "now SIGNAL t2_cont1";
|
|
SET DEBUG_SYNC= "now WAIT_FOR t2_ready2";
|
|
SET DEBUG_SYNC= "now SIGNAL t1_cont2";
|
|
connection server_1;
|
|
connection server_2;
|
|
SELECT * FROM t2 WHERE a>=60 ORDER BY a;
|
|
a
|
|
60
|
|
SELECT * FROM t1 WHERE a>=60 ORDER BY a;
|
|
a
|
|
60
|
|
61
|
|
SELECT * FROM t6 WHERE a>=60 ORDER BY a;
|
|
a
|
|
62
|
|
SET DEBUG_SYNC="reset";
|
|
include/stop_slave.inc
|
|
SET GLOBAL debug_dbug=@old_dbug;
|
|
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
|
|
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
|
|
include/start_slave.inc
|
|
connection server_1;
|
|
DROP function foo;
|
|
DROP TABLE t1,t2,t6;
|
|
disconnect con_temp3;
|
|
disconnect con_temp4;
|
|
SET DEBUG_SYNC= 'RESET';
|
|
include/rpl_end.inc
|