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
158 lines
2.6 KiB
Text
158 lines
2.6 KiB
Text
include/master-slave.inc
|
|
[connection master]
|
|
connection server_2;
|
|
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
|
|
include/stop_slave.inc
|
|
SET GLOBAL slave_parallel_threads=10;
|
|
CHANGE MASTER TO master_use_gtid=current_pos;
|
|
include/start_slave.inc
|
|
*** MDEV-6589: Incorrect relay log start position when restarting SQL thread after error in parallel replication ***
|
|
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;
|
|
INSERT INTO t1 VALUES (1);
|
|
INSERT INTO t2 VALUES (1);
|
|
connection server_2;
|
|
SELECT * FROM t1;
|
|
a
|
|
1
|
|
SELECT * FROM t2;
|
|
a
|
|
1
|
|
connect con_temp1,127.0.0.1,root,,test,$SERVER_MYPORT_2,;
|
|
SET sql_log_bin=0;
|
|
BEGIN;
|
|
INSERT INTO t2 VALUES (5);
|
|
connection server_1;
|
|
SET gtid_domain_id=0;
|
|
INSERT INTO t1 VALUES (2);
|
|
INSERT INTO t2 VALUES (3);
|
|
FLUSH LOGS;
|
|
INSERT INTO t1 VALUES (4);
|
|
SET gtid_domain_id=1;
|
|
INSERT INTO t2 VALUES (5);
|
|
SET gtid_domain_id=0;
|
|
INSERT INTO t1 VALUES (6);
|
|
INSERT INTO t1 VALUES (7);
|
|
SET gtid_domain_id=2;
|
|
INSERT INTO t2 VALUES (8);
|
|
INSERT INTO t1 VALUES (9);
|
|
FLUSH LOGS;
|
|
SET gtid_domain_id=3;
|
|
INSERT INTO t2 VALUES (10);
|
|
INSERT INTO t1 VALUES (11);
|
|
SET gtid_domain_id=1;
|
|
INSERT INTO t1 VALUES (12);
|
|
INSERT INTO t2 VALUES (13);
|
|
SET gtid_domain_id=0;
|
|
INSERT INTO t2 VALUES (14);
|
|
FLUSH LOGS;
|
|
SET gtid_domain_id=3;
|
|
INSERT INTO t2 VALUES (15);
|
|
SET gtid_domain_id=2;
|
|
INSERT INTO t2 VALUES (16);
|
|
SET gtid_domain_id=0;
|
|
INSERT INTO t1 VALUES (17);
|
|
SET @gtid0 = @@last_gtid;
|
|
SET gtid_domain_id=2;
|
|
INSERT INTO t1 VALUES (18);
|
|
SET @gtid2 = @@last_gtid;
|
|
SET gtid_domain_id=3;
|
|
INSERT INTO t1 VALUES (19);
|
|
SET @gtid3 = @@last_gtid;
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a
|
|
1
|
|
2
|
|
4
|
|
6
|
|
7
|
|
9
|
|
11
|
|
12
|
|
17
|
|
18
|
|
19
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a
|
|
1
|
|
3
|
|
5
|
|
8
|
|
10
|
|
13
|
|
14
|
|
15
|
|
16
|
|
include/save_master_gtid.inc
|
|
connection server_2;
|
|
SELECT MASTER_GTID_WAIT('WAIT_POS');
|
|
MASTER_GTID_WAIT('WAIT_POS')
|
|
0
|
|
connection con_temp1;
|
|
COMMIT;
|
|
CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
|
|
SET sql_log_bin=1;
|
|
connection server_2;
|
|
include/wait_for_slave_sql_error.inc [errno=1062]
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a
|
|
1
|
|
2
|
|
4
|
|
6
|
|
7
|
|
9
|
|
11
|
|
17
|
|
18
|
|
19
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a
|
|
1
|
|
3
|
|
5
|
|
8
|
|
10
|
|
14
|
|
15
|
|
16
|
|
SET sql_log_bin=0;
|
|
DELETE FROM t2 WHERE a=5;
|
|
SET sql_log_bin=1;
|
|
include/start_slave.inc
|
|
include/sync_with_master_gtid.inc
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a
|
|
1
|
|
2
|
|
4
|
|
6
|
|
7
|
|
9
|
|
11
|
|
12
|
|
17
|
|
18
|
|
19
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a
|
|
1
|
|
3
|
|
5
|
|
8
|
|
10
|
|
13
|
|
14
|
|
15
|
|
16
|
|
connection server_2;
|
|
include/stop_slave.inc
|
|
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
|
|
include/start_slave.inc
|
|
SET DEBUG_SYNC= 'RESET';
|
|
connection server_1;
|
|
DROP TABLE t1,t2;
|
|
SET DEBUG_SYNC= 'RESET';
|
|
include/rpl_end.inc
|