MDEV-7271 : rpl.rpl_domain_id_filter fails sporadically in buildbot

Use save_master_gtid.inc/sync_with_master_gtid.inc to sync slave
with master instead of log position.

mysql-test/suite/rpl/r/rpl_domain_id_filter.result

@@ -13,7 +13,9 @@ INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
 i
 1
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 SELECT * FROM t1;
 i
 1
@@ -34,7 +36,9 @@ i
 1
 2
 3
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 SELECT * FROM t1;
 i
 1
@@ -60,7 +64,9 @@ i
 3
 4
 5
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 SELECT * FROM t1;
 i
 1
@@ -98,7 +104,9 @@ INSERT INTO t1 VALUES(13);
 COMMIT;
 INSERT INTO t1 VALUES(14);
 INSERT INTO t1 VALUES(15);
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 SELECT * FROM t1;
 i
 1
@@ -132,8 +140,10 @@ include/wait_for_slave_to_stop.inc
 INSERT INTO t2 VALUES(2);
 INSERT INTO t3 VALUES(2);
 COMMIT;
+include/save_master_gtid.inc
 # On slave
 include/start_slave.inc
+include/sync_with_master_gtid.inc
 SELECT * FROM t2;
 i
 SELECT * FROM t3;
@@ -155,7 +165,9 @@ IGNORE_DOMAIN_IDS (AFTER) :
 INSERT INTO t2 VALUES(4);
 INSERT INTO t3 VALUES(4);
 COMMIT;
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 SELECT * FROM t2;
 i
 4
@@ -180,7 +192,9 @@ IGNORE_DOMAIN_IDS (AFTER) : 1
 INSERT INTO t2 VALUES(6);
 INSERT INTO t3 VALUES(6);
 COMMIT;
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 SELECT * FROM t2;
 i
 4
@@ -203,7 +217,9 @@ BEGIN;
 INSERT INTO t2 VALUES(7);
 INSERT INTO t3 VALUES(7);
 COMMIT;
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 include/stop_slave.inc
 DO_DOMAIN_IDS (BEFORE)     : 
 IGNORE_DOMAIN_IDS (BEFORE) : 2
@@ -217,6 +233,9 @@ BEGIN;
 INSERT INTO t2 VALUES(8);
 INSERT INTO t3 VALUES(8);
 COMMIT;
+include/save_master_gtid.inc
+# On slave
+include/sync_with_master_gtid.inc
 SELECT * FROM t2;
 i
 4
@@ -254,7 +273,9 @@ include/start_slave.inc
 # On master
 SET @@session.gtid_domain_id=2;
 DROP TABLE t1, t2, t3;
+include/save_master_gtid.inc
 # On slave
+include/sync_with_master_gtid.inc
 include/stop_slave.inc
 CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=();
 include/start_slave.inc

mysql-test/suite/rpl/t/rpl_domain_id_filter.test

@@ -17,11 +17,11 @@ SELECT @@session.gtid_domain_id;
 CREATE TABLE t1(i INT) ENGINE=INNODB;
 INSERT INTO t1 VALUES(1);
 SELECT * FROM t1;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 --echo # On slave
 connection slave;
-
+--source include/sync_with_master_gtid.inc
 ##### Case 0 : When both DO_DOMAIN_IDS and IGNORE_DOMAIN_IDS are empty.
 SELECT * FROM t1;
 
@@ -35,7 +35,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # Replicate events belonging to "domain_id 1".
 CHANGE MASTER TO DO_DOMAIN_IDS=(1), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -54,10 +53,11 @@ SET @@session.gtid_domain_id= 1;
 INSERT INTO t1 VALUES(3);
 
 SELECT * FROM t1;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 --echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 SELECT * FROM t1;
 
 ##### Case 2: When IGNORE_DOMAIN_IDS is non-empty.
@@ -70,7 +70,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # Ignore events belonging to "domain_id 1".
 CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=(1), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -89,10 +88,11 @@ SET @@session.gtid_domain_id= 2;
 INSERT INTO t1 VALUES(5);
 
 SELECT * FROM t1;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 --echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 SELECT * FROM t1;
 
 ##### Case 3: When both DO_DOMAIN_IDS and IGNORE_DOMAIN_IDS are non-empty
@@ -122,7 +122,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # Replicate events belonging to "domain_id 1".
 CHANGE MASTER TO DO_DOMAIN_IDS=(4,4,5,1,7,7,7,1,1,2,6,8,1,4,5,5,9,3), IGNORE_DOMAIN_IDS=(), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -150,10 +149,11 @@ INSERT INTO t1 VALUES(13);
 COMMIT;
 INSERT INTO t1 VALUES(14);
 INSERT INTO t1 VALUES(15);
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 --echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 SELECT * FROM t1;
 
 ##### Case 5: Seconds_Behind_Master
@@ -177,7 +177,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # IGNORE_DOMAIN_IDS=(1)
 CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=(1), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -195,7 +194,6 @@ SET @@session.gtid_domain_id=1;
 BEGIN;
 INSERT INTO t2 VALUES(1);
 INSERT INTO t3 VALUES(1);
-sync_slave_with_master;
 
 # Now switch to slave to stop replication.
 --echo # On slave
@@ -209,13 +207,13 @@ connection master;
 INSERT INTO t2 VALUES(2);
 INSERT INTO t3 VALUES(2);
 COMMIT;
-save_master_pos;
+--source include/save_master_gtid.inc
 
 # On slave to start replication.
 --echo # On slave
 connection slave;
 --source include/start_slave.inc
-sync_with_master;
+--source include/sync_with_master_gtid.inc
 
 SELECT * FROM t2;
 SELECT * FROM t3;
@@ -230,10 +228,11 @@ SET @@session.gtid_domain_id=1;
 BEGIN;
 INSERT INTO t2 VALUES(3);
 INSERT INTO t3 VALUES(3);
-sync_slave_with_master;
+save_master_pos;
 
 --echo # On slave
 connection slave;
+sync_with_master;
 --source include/stop_slave.inc
 let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -243,7 +242,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # Clear IGNORE_DOMAIN_IDS
 CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=(), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -255,10 +253,11 @@ connection master;
 INSERT INTO t2 VALUES(4);
 INSERT INTO t3 VALUES(4);
 COMMIT;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 --echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 SELECT * FROM t2;
 SELECT * FROM t3;
 
@@ -271,10 +270,11 @@ SET @@session.gtid_domain_id=1;
 BEGIN;
 INSERT INTO t2 VALUES(5);
 INSERT INTO t3 VALUES(5);
-sync_slave_with_master;
+save_master_pos;
 
 --echo # On slave
 connection slave;
+sync_with_master;
 --source include/stop_slave.inc
 let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -284,7 +284,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # IGNORE_DOMAIN_IDS(1)
 CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=(1), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -296,10 +295,11 @@ connection master;
 INSERT INTO t2 VALUES(6);
 INSERT INTO t3 VALUES(6);
 COMMIT;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 --echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 SELECT * FROM t2;
 SELECT * FROM t3;
 
@@ -317,7 +317,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # IGNORE_DOMAIN_IDS(2)
 CHANGE MASTER TO IGNORE_DOMAIN_IDS=(2), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -331,11 +330,12 @@ BEGIN;
 INSERT INTO t2 VALUES(7);
 INSERT INTO t3 VALUES(7);
 COMMIT;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 # Clear the filter
 --echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 --source include/stop_slave.inc
 let $do_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -345,7 +345,6 @@ let $ignore_domain_ids_before= query_get_value(SHOW SLAVE STATUS, Replicate_Igno
 # IGNORE_DOMAIN_IDS()
 CHANGE MASTER TO IGNORE_DOMAIN_IDS=(), MASTER_USE_GTID=slave_pos;
 --source include/start_slave.inc
-sync_with_master;
 
 let $do_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Do_Domain_Ids, 1);
 let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignore_Domain_Ids, 1);
@@ -359,10 +358,11 @@ BEGIN;
 INSERT INTO t2 VALUES(8);
 INSERT INTO t3 VALUES(8);
 COMMIT;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
-# On slave
+--echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 SELECT * FROM t2;
 SELECT * FROM t3;
 
@@ -413,17 +413,17 @@ let $ignore_domain_ids_after= query_get_value(SHOW SLAVE STATUS, Replicate_Ignor
 
 CHANGE MASTER TO IGNORE_DOMAIN_IDS=(1), DO_DOMAIN_IDS=(), MASTER_USE_GTID=SLAVE_POS;
 --source include/start_slave.inc
-sync_with_master;
 
 # Cleanup
 --echo # On master
 connection master;
 SET @@session.gtid_domain_id=2;
 DROP TABLE t1, t2, t3;
-sync_slave_with_master;
+--source include/save_master_gtid.inc
 
 --echo # On slave
 connection slave;
+--source include/sync_with_master_gtid.inc
 --source include/stop_slave.inc
 CHANGE MASTER TO DO_DOMAIN_IDS=(), IGNORE_DOMAIN_IDS=();
 --source include/start_slave.inc