mirror of
https://github.com/MariaDB/server.git
synced 2025-02-10 15:35:34 +01:00
![Sujatha](/assets/img/avatar_default.png)
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
68 lines
1.5 KiB
Text
68 lines
1.5 KiB
Text
include/master-slave.inc
|
|
[connection master]
|
|
connection master;
|
|
ALTER TABLE mysql.gtid_slave_pos ENGINE = InnoDB;
|
|
CREATE TABLE t1 (a INT PRIMARY KEY, b INT) Engine=InnoDB;
|
|
connection slave;
|
|
connection slave;
|
|
include/stop_slave.inc
|
|
SET sql_log_bin= 0;
|
|
CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
|
|
INSERT INTO t1 VALUES (1, 2);
|
|
SET sql_log_bin= 1;
|
|
CHANGE MASTER TO master_use_gtid= current_pos;
|
|
Contents on slave before:
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b
|
|
1 2
|
|
SET @old_parallel= @@GLOBAL.slave_parallel_threads;
|
|
SET GLOBAL slave_parallel_threads=8;
|
|
connection master;
|
|
CREATE TEMPORARY TABLE t2 LIKE t1;
|
|
INSERT INTO t2 VALUE (1, 1);
|
|
INSERT INTO t2 VALUE (2, 1);
|
|
INSERT INTO t2 VALUE (3, 1);
|
|
INSERT INTO t2 VALUE (4, 1);
|
|
INSERT INTO t2 VALUE (5, 1);
|
|
INSERT INTO t1 SELECT * FROM t2;
|
|
DROP TEMPORARY TABLE t2;
|
|
INSERT INTO t1 VALUE (6, 3);
|
|
include/save_master_gtid.inc
|
|
Contents on master:
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b
|
|
1 1
|
|
2 1
|
|
3 1
|
|
4 1
|
|
5 1
|
|
6 3
|
|
connection slave;
|
|
START SLAVE;
|
|
include/wait_for_slave_sql_error.inc [errno=1062]
|
|
STOP SLAVE IO_THREAD;
|
|
Contents on slave on slave error:
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b
|
|
1 2
|
|
SET sql_log_bin= 0;
|
|
DELETE FROM t1 WHERE a=1;
|
|
SET sql_log_bin= 1;
|
|
include/start_slave.inc
|
|
include/sync_with_master_gtid.inc
|
|
Contents on slave after:
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b
|
|
1 1
|
|
2 1
|
|
3 1
|
|
4 1
|
|
5 1
|
|
6 3
|
|
connection master;
|
|
DROP TABLE t1;
|
|
connection slave;
|
|
include/stop_slave.inc
|
|
SET GLOBAL slave_parallel_threads= @old_parallel;
|
|
include/start_slave.inc
|
|
include/rpl_end.inc
|