Fix flakiness in rpl per_channel tests

hermanlee · inikep · commit 9afc13574959 · 2024-05-17T11:04:50.000+02:00
Summary:
These tests fail occasionally due to an error message about the
channel being stopped in the error log. Suppress this error message.

Reviewed By: lth

Differential Revision: D45573014

---------------------------------------------------------------------

Fix flakiness for rpl.rpl_innodb_auto_increment

Summary:
These tests fail occasionally due to an error message about the
    channel being stopped in the error log. Suppress this error message.

Differential Revision: D44844728
diff --git a/mysql-test/suite/rpl/r/rpl_cloned_slave_relay_log_info.result b/mysql-test/suite/rpl/r/rpl_cloned_slave_relay_log_info.result
@@ -96,6 +96,7 @@ call mtr.add_suppression("Recovery from source pos [0-9]+ and file [a-zA-Z-]+\.[
 call mtr.add_suppression("Applier metadata information for channel 'channel_1' was found after a clone operation. Relay log recovery*");
 call mtr.add_suppression("Applier metadata information for channel 'channel_3' was found after a clone operation. Relay log recovery*");
 call mtr.add_suppression("Relay log recovery on channel with GTID_ONLY=1*");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 set session sql_log_bin=1;
 include/rpl_end.inc
 RESET REPLICA ALL FOR CHANNEL 'channel_1';
diff --git a/mysql-test/suite/rpl/r/rpl_do_db_per_channel_filter.result b/mysql-test/suite/rpl/r/rpl_do_db_per_channel_filter.result
@@ -2,6 +2,7 @@ include/rpl_init.inc [topology=1->2,3->2]
 [connection server_2]
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT,SOURCE_USER='root' for CHANNEL '';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT_3,SOURCE_USER='root' for CHANNEL 'channel_3_2';
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_do_table_per_channel_filter.result b/mysql-test/suite/rpl/r/rpl_do_table_per_channel_filter.result
@@ -2,6 +2,7 @@ include/rpl_init.inc [topology=1->2,3->2]
 [connection server_2]
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_PORT=MASTER_PORT, SOURCE_USER='root' for CHANNEL '';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_PORT=MASTER_PORT_3, SOURCE_USER='root' for CHANNEL 'channel_3_2';
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_ignore_db_per_channel_filter.result b/mysql-test/suite/rpl/r/rpl_ignore_db_per_channel_filter.result
@@ -2,6 +2,7 @@ include/rpl_init.inc [topology=1->2,3->2]
 [connection server_2]
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT,SOURCE_USER='root' for CHANNEL '';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT_3,SOURCE_USER='root' for CHANNEL 'channel_3_2';
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_ignore_table_per_channel_filter.result b/mysql-test/suite/rpl/r/rpl_ignore_table_per_channel_filter.result
@@ -2,6 +2,7 @@ include/rpl_init.inc [topology=1->2,3->2]
 [connection server_2]
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_PORT=MASTER_PORT, SOURCE_USER='root' for CHANNEL '';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_PORT=MASTER_PORT_3, SOURCE_USER='root' for CHANNEL 'channel_3_2';
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_initialize_serverid.result b/mysql-test/suite/rpl/r/rpl_initialize_serverid.result
@@ -5,6 +5,8 @@ Note	####	Storing MySQL user name or password information in the connection meta
 [connection master]
 
 [connection slave]
+set session sql_log_bin=0;
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 include/rpl_stop_server.inc [server_number=2]
 
 [connection master]
diff --git a/mysql-test/suite/rpl/r/rpl_innodb_auto_increment.result b/mysql-test/suite/rpl/r/rpl_innodb_auto_increment.result
@@ -4,6 +4,7 @@ Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	####	Storing MySQL user name or password information in the connection metadata repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START REPLICA; see the 'START REPLICA Syntax' in the MySQL Manual for more information.
 [connection master]
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 [connection slave]
 CHANGE REPLICATION SOURCE TO SOURCE_CONNECT_RETRY = 30 ;
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_rewrite_db_per_channel_filter.result b/mysql-test/suite/rpl/r/rpl_rewrite_db_per_channel_filter.result
@@ -2,6 +2,7 @@ include/rpl_init.inc [topology=1->2,3->2]
 [connection server_2]
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_PORT=MASTER_PORT, SOURCE_USER='root' for CHANNEL '';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost', SOURCE_PORT=MASTER_PORT_3, SOURCE_USER='root' for CHANNEL 'channel_3_2';
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_wild_do_table_per_channel_filter.result b/mysql-test/suite/rpl/r/rpl_wild_do_table_per_channel_filter.result
@@ -2,6 +2,7 @@ include/rpl_init.inc [topology=1->2,3->2]
 [connection server_2]
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT,SOURCE_USER='root' for CHANNEL '';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT_3,SOURCE_USER='root' for CHANNEL 'channel_3_2';
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/r/rpl_wild_ignore_table_per_channel_filter.result b/mysql-test/suite/rpl/r/rpl_wild_ignore_table_per_channel_filter.result
@@ -2,6 +2,7 @@ include/rpl_init.inc [topology=1->2,3->2]
 [connection server_2]
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT,SOURCE_USER='root' for CHANNEL '';
 CHANGE REPLICATION SOURCE TO SOURCE_HOST='localhost',SOURCE_PORT=MASTER_PORT_3,SOURCE_USER='root' for CHANNEL 'channel_3_2';
 include/start_slave.inc
diff --git a/mysql-test/suite/rpl/t/rpl_cloned_slave_relay_log_info.test b/mysql-test/suite/rpl/t/rpl_cloned_slave_relay_log_info.test
@@ -268,6 +268,7 @@ call mtr.add_suppression("Recovery from source pos [0-9]+ and file [a-zA-Z-]+\.[
 call mtr.add_suppression("Applier metadata information for channel 'channel_1' was found after a clone operation. Relay log recovery*");
 call mtr.add_suppression("Applier metadata information for channel 'channel_3' was found after a clone operation. Relay log recovery*");
 call mtr.add_suppression("Relay log recovery on channel with GTID_ONLY=1*");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 set session sql_log_bin=1;
 
 --let $rpl_skip_sync= 1
diff --git a/mysql-test/suite/rpl/t/rpl_do_db_per_channel_filter.test b/mysql-test/suite/rpl/t/rpl_do_db_per_channel_filter.test
@@ -31,6 +31,7 @@
 
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/mysql-test/suite/rpl/t/rpl_do_table_per_channel_filter.test b/mysql-test/suite/rpl/t/rpl_do_table_per_channel_filter.test
@@ -31,6 +31,7 @@
 
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/mysql-test/suite/rpl/t/rpl_ignore_db_per_channel_filter.test b/mysql-test/suite/rpl/t/rpl_ignore_db_per_channel_filter.test
@@ -31,6 +31,7 @@
 
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/mysql-test/suite/rpl/t/rpl_ignore_table_per_channel_filter.test b/mysql-test/suite/rpl/t/rpl_ignore_table_per_channel_filter.test
@@ -31,6 +31,7 @@
 
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/mysql-test/suite/rpl/t/rpl_initialize_serverid.test b/mysql-test/suite/rpl/t/rpl_initialize_serverid.test
@@ -68,6 +68,8 @@ EOF
 # 1. Stop slave server so that it can be initialized by specifying server-id and
 # started without specifying server-id
 --let $rpl_server_number= 2
+set session sql_log_bin=0;
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 --source include/rpl_stop_server.inc
 
 # 2. Since server-2 has previously been initialized to a data directory by MTR,
diff --git a/mysql-test/suite/rpl/t/rpl_innodb_auto_increment.test b/mysql-test/suite/rpl/t/rpl_innodb_auto_increment.test
@@ -22,6 +22,7 @@
 --source include/big_test.inc
 
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 # Increasing master_connect_retry to increase the time interval between connection retries due to Bug#23615424:
 # WL#6338: RPL.RPL_INNODB_AUTO_INCREMENT FAILS WITH ERROR IN SYNC_WITH_MASTER.INC
diff --git a/mysql-test/suite/rpl/t/rpl_rewrite_db_per_channel_filter.test b/mysql-test/suite/rpl/t/rpl_rewrite_db_per_channel_filter.test
@@ -31,6 +31,7 @@
 
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/mysql-test/suite/rpl/t/rpl_wild_do_table_per_channel_filter.test b/mysql-test/suite/rpl/t/rpl_wild_do_table_per_channel_filter.test
@@ -32,6 +32,7 @@
 
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/mysql-test/suite/rpl/t/rpl_wild_ignore_table_per_channel_filter.test b/mysql-test/suite/rpl/t/rpl_wild_ignore_table_per_channel_filter.test
@@ -34,6 +34,7 @@
 
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel '' which does not exist. The filter.s. have been discarded.");
 call mtr.add_suppression("There are per-channel replication filter.s. configured for channel 'channel_3_2' which does not exist. The filter.s. have been discarded.");
+call mtr.add_suppression("The replica coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
