Fix flakiness in rpl per_channel tests

hermanlee · Herman Lee · commit a459aa0fb331 · 2023-10-03T09:48:01.000-07: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
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 slave 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 slave 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 slave 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 slave 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_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 slave 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 slave 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 slave 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_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 slave 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 slave 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 slave 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 slave coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
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 slave 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 slave 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 slave coordinator and worker threads are stopped");
 
 --disable_warnings
 --replace_result $MASTER_MYPORT MASTER_PORT
