mirror of
https://github.com/MariaDB/server.git
synced 2025-05-31 08:42:45 +03: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
324 lines
8.8 KiB
Plaintext
324 lines
8.8 KiB
Plaintext
*** Test killing slave threads at various wait points ***
|
|
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_threads=10;
|
|
SET GLOBAL slave_parallel_mode='conservative';
|
|
CHANGE MASTER TO master_use_gtid=slave_pos;
|
|
include/start_slave.inc
|
|
connection server_1;
|
|
connect con_temp3,127.0.0.1,root,,test,$SERVER_MYPORT_1,;
|
|
connect con_temp4,127.0.0.1,root,,test,$SERVER_MYPORT_1,;
|
|
connect con_temp5,127.0.0.1,root,,test,$SERVER_MYPORT_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 t3 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
|
|
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;
|
|
*** 1. Test killing transaction waiting in commit for previous transaction to commit ***
|
|
connection con_temp3;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1';
|
|
INSERT INTO t3 VALUES (31, foo(31,
|
|
'commit_before_prepare_ordered WAIT_FOR t2_waiting',
|
|
'commit_after_prepare_ordered SIGNAL t1_ready WAIT_FOR t1_cont'));
|
|
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';
|
|
BEGIN;
|
|
INSERT INTO t3 VALUES (32, foo(32,
|
|
'ha_write_row_end SIGNAL t2_query WAIT_FOR t2_cont',
|
|
''));
|
|
INSERT INTO t3 VALUES (33, foo(33,
|
|
'group_commit_waiting_for_prior SIGNAL t2_waiting',
|
|
'group_commit_waiting_for_prior_killed SIGNAL t2_killed'));
|
|
COMMIT;
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued2';
|
|
connection con_temp5;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued3';
|
|
INSERT INTO t3 VALUES (34, foo(34,
|
|
'',
|
|
''));
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued3';
|
|
SET debug_sync='now SIGNAL master_cont1';
|
|
connection con_temp3;
|
|
connection con_temp4;
|
|
connection con_temp5;
|
|
connection server_1;
|
|
SELECT * FROM t3 WHERE a >= 30 ORDER BY a;
|
|
a b
|
|
31 31
|
|
32 32
|
|
33 33
|
|
34 34
|
|
SET debug_sync='RESET';
|
|
connection server_2;
|
|
SET sql_log_bin=0;
|
|
CALL mtr.add_suppression("Query execution was interrupted");
|
|
CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
|
|
CALL mtr.add_suppression("Slave: Connection was killed");
|
|
SET sql_log_bin=1;
|
|
SET debug_sync='now WAIT_FOR t2_query';
|
|
SET debug_sync='now SIGNAL t2_cont';
|
|
SET debug_sync='now WAIT_FOR t1_ready';
|
|
KILL THD_ID;
|
|
SET debug_sync='now WAIT_FOR t2_killed';
|
|
SET debug_sync='now SIGNAL t1_cont';
|
|
include/wait_for_slave_sql_error.inc [errno=1317,1927,1964]
|
|
STOP SLAVE IO_THREAD;
|
|
SELECT * FROM t3 WHERE a >= 30 ORDER BY a;
|
|
a b
|
|
31 31
|
|
SET debug_sync='RESET';
|
|
SET GLOBAL slave_parallel_threads=0;
|
|
SET GLOBAL slave_parallel_threads=10;
|
|
SET sql_log_bin=0;
|
|
DROP FUNCTION foo;
|
|
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_1;
|
|
INSERT INTO t3 VALUES (39,0);
|
|
connection server_2;
|
|
include/start_slave.inc
|
|
SELECT * FROM t3 WHERE a >= 30 ORDER BY a;
|
|
a b
|
|
31 31
|
|
32 32
|
|
33 33
|
|
34 34
|
|
39 0
|
|
SET sql_log_bin=0;
|
|
DROP FUNCTION foo;
|
|
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=10;
|
|
include/start_slave.inc
|
|
*** 2. Same as (1), but without restarting IO thread after kill of SQL threads ***
|
|
connection con_temp3;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1';
|
|
INSERT INTO t3 VALUES (41, foo(41,
|
|
'commit_before_prepare_ordered WAIT_FOR t2_waiting',
|
|
'commit_after_prepare_ordered SIGNAL t1_ready WAIT_FOR t1_cont'));
|
|
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';
|
|
BEGIN;
|
|
INSERT INTO t3 VALUES (42, foo(42,
|
|
'ha_write_row_end SIGNAL t2_query WAIT_FOR t2_cont',
|
|
''));
|
|
INSERT INTO t3 VALUES (43, foo(43,
|
|
'group_commit_waiting_for_prior SIGNAL t2_waiting',
|
|
'group_commit_waiting_for_prior_killed SIGNAL t2_killed'));
|
|
COMMIT;
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued2';
|
|
connection con_temp5;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued3';
|
|
INSERT INTO t3 VALUES (44, foo(44,
|
|
'',
|
|
''));
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued3';
|
|
SET debug_sync='now SIGNAL master_cont1';
|
|
connection con_temp3;
|
|
connection con_temp4;
|
|
connection con_temp5;
|
|
connection server_1;
|
|
SELECT * FROM t3 WHERE a >= 40 ORDER BY a;
|
|
a b
|
|
41 41
|
|
42 42
|
|
43 43
|
|
44 44
|
|
SET debug_sync='RESET';
|
|
connection server_2;
|
|
SET debug_sync='now WAIT_FOR t2_query';
|
|
SET debug_sync='now SIGNAL t2_cont';
|
|
SET debug_sync='now WAIT_FOR t1_ready';
|
|
KILL THD_ID;
|
|
SET debug_sync='now WAIT_FOR t2_killed';
|
|
SET debug_sync='now SIGNAL t1_cont';
|
|
include/wait_for_slave_sql_error.inc [errno=1317,1927,1964]
|
|
SET debug_sync='RESET';
|
|
SET GLOBAL slave_parallel_threads=0;
|
|
SET GLOBAL slave_parallel_threads=10;
|
|
SET sql_log_bin=0;
|
|
DROP FUNCTION foo;
|
|
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_1;
|
|
INSERT INTO t3 VALUES (49,0);
|
|
connection server_2;
|
|
START SLAVE SQL_THREAD;
|
|
SELECT * FROM t3 WHERE a >= 40 ORDER BY a;
|
|
a b
|
|
41 41
|
|
42 42
|
|
43 43
|
|
44 44
|
|
49 0
|
|
SET sql_log_bin=0;
|
|
DROP FUNCTION foo;
|
|
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=10;
|
|
include/start_slave.inc
|
|
*** 3. Same as (2), but not using gtid mode ***
|
|
connection server_2;
|
|
include/stop_slave.inc
|
|
CHANGE MASTER TO master_use_gtid=no;
|
|
include/start_slave.inc
|
|
connection server_1;
|
|
connection con_temp3;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1';
|
|
INSERT INTO t3 VALUES (51, foo(51,
|
|
'commit_before_prepare_ordered WAIT_FOR t2_waiting',
|
|
'commit_after_prepare_ordered SIGNAL t1_ready WAIT_FOR t1_cont'));
|
|
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';
|
|
BEGIN;
|
|
INSERT INTO t3 VALUES (52, foo(52,
|
|
'ha_write_row_end SIGNAL t2_query WAIT_FOR t2_cont',
|
|
''));
|
|
INSERT INTO t3 VALUES (53, foo(53,
|
|
'group_commit_waiting_for_prior SIGNAL t2_waiting',
|
|
'group_commit_waiting_for_prior_killed SIGNAL t2_killed'));
|
|
COMMIT;
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued2';
|
|
connection con_temp5;
|
|
SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued3';
|
|
INSERT INTO t3 VALUES (54, foo(54,
|
|
'',
|
|
''));
|
|
connection server_1;
|
|
SET debug_sync='now WAIT_FOR master_queued3';
|
|
SET debug_sync='now SIGNAL master_cont1';
|
|
connection con_temp3;
|
|
connection con_temp4;
|
|
connection con_temp5;
|
|
connection server_1;
|
|
SELECT * FROM t3 WHERE a >= 50 ORDER BY a;
|
|
a b
|
|
51 51
|
|
52 52
|
|
53 53
|
|
54 54
|
|
SET debug_sync='RESET';
|
|
connection server_2;
|
|
SET debug_sync='now WAIT_FOR t2_query';
|
|
SET debug_sync='now SIGNAL t2_cont';
|
|
SET debug_sync='now WAIT_FOR t1_ready';
|
|
KILL THD_ID;
|
|
SET debug_sync='now WAIT_FOR t2_killed';
|
|
SET debug_sync='now SIGNAL t1_cont';
|
|
include/wait_for_slave_sql_error.inc [errno=1317,1927,1964]
|
|
SELECT * FROM t3 WHERE a >= 50 ORDER BY a;
|
|
a b
|
|
51 51
|
|
SET debug_sync='RESET';
|
|
SET GLOBAL slave_parallel_threads=0;
|
|
SET GLOBAL slave_parallel_threads=10;
|
|
SET sql_log_bin=0;
|
|
DROP FUNCTION foo;
|
|
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_1;
|
|
INSERT INTO t3 VALUES (59,0);
|
|
connection server_2;
|
|
START SLAVE SQL_THREAD;
|
|
SELECT * FROM t3 WHERE a >= 50 ORDER BY a;
|
|
a b
|
|
51 51
|
|
52 52
|
|
53 53
|
|
54 54
|
|
59 0
|
|
connection server_2;
|
|
include/stop_slave.inc
|
|
CHANGE MASTER TO master_use_gtid=slave_pos;
|
|
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
|
|
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
|
|
include/start_slave.inc
|
|
SET DEBUG_SYNC= 'RESET';
|
|
connection server_1;
|
|
DROP function foo;
|
|
DROP TABLE t1,t2,t3;
|
|
SET DEBUG_SYNC= 'RESET';
|
|
include/rpl_end.inc
|