From 387bdb2a2ece0d86b189c54fe1bbd48c7fc3d025 Mon Sep 17 00:00:00 2001 From: Andrei Date: Wed, 19 Jun 2024 14:03:31 +0300 Subject: [PATCH] MDEV-29934 rpl.rpl_start_alter_chain_basic, rpl.rpl_start_alter_restart_slave sometimes fail in BB with result content mismatch rpl.rpl_start_alter_chain_basic was used to fail sporadically due to a missed GTID master-slave synchronization which was necessary because of the following SELECT from GTID-state table. Fixed with arranging two synchronization pieces for two chain slaves requiring that. Note rpl.rpl_start_alter_restart_slave must have been fixed by MDEV-30460 and 87e13722a95a (manual) merge commit. --- mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result | 4 ++++ mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result index b6c28458561..a62b02b2f44 100644 --- a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result +++ b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result @@ -64,7 +64,10 @@ connection server_2; select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; domain_id seq_no 0 12 +connection server_1; +include/save_master_gtid.inc connection server_3; +include/sync_with_master_gtid.inc select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; domain_id seq_no 0 12 @@ -77,6 +80,7 @@ select @@slave_parallel_threads; @@slave_parallel_threads 0 connection server_4; +include/sync_with_master_gtid.inc select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; domain_id seq_no 0 12 diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test index 2c6f9c0fd72..efb667ad6fa 100644 --- a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test +++ b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test @@ -39,7 +39,11 @@ connect(slave_node,127.0.0.1,root,,test, $SERVER_MYPORT_2); --connection server_2 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; +--connection server_1 +--source include/save_master_gtid.inc --connection server_3 +--source include/sync_with_master_gtid.inc + select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; --source include/stop_slave.inc --eval set global slave_parallel_threads = $slave_parallel_threads; @@ -49,6 +53,7 @@ select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; select @@slave_parallel_threads; --connection server_4 +--source include/sync_with_master_gtid.inc select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1; --source include/rpl_end.inc