BUG#36882629: Unstable RPL tests - part 1

nacarvalho · nacarvalho · commit 7bbe5af94733 · 2024-07-26T16:09:38.000+02:00
The following tests were updated to avoid them to fail on several
combinations of server configurations.

rpl_inconsistent_logical_timestamp_replica_parallel_workers
  Test is not prepared to run with GTID_MODE=ON, skip it on that
  configuration.

rpl_mts_rec_crash_safe_small
  Test was running on a deprecated configuration, test was removed.

rpl_relay_log_rotation_on_worker_failure
  Test must only run with replica_parallel_type=LOGICAL_CLOCK.

rpl_xa_commit_fail_preceding_trx
  Test must only run with replica_parallel_type=LOGICAL_CLOCK and
  multiple parallel workers.

rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions
rpl_log_info_repository_persistence_require_table_primary_key_check
  Tests had a incorrect assert.

rpl_change_master_without_stopping_slave
rpl_multi_source_init_failure
rpl_mysqlbinlog_gtid_on
rpl_rotate_gtid
  Test is not prepared to run with CHANGE REPLICATION SOURCE ...
  GTID_ONLY=1, skip it on that configuration.

rpl_relay_log_space_limit_net_write_timeout
rpl_stm_non_trans_mix_engine_warning
  Test is not prepared to run with CHANGE REPLICATION SOURCE ...
  PRIVILEGE_CHECKS_USER='user', skip it on that configuration.

rpl_gtid_parallel_pitr
  Test was not doing a proper cleanup.

Change-Id: I72f75edef417112da51da7b10d9cdba221f9e37f
diff --git a/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.result b/mysql-test/suite/rpl/r/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.result
@@ -95,7 +95,7 @@ include/assert.inc [Check entry for default channel "" in mysql.slave_relay_log_
 
 # 4. Cleanup
 CALL mtr.add_suppression("Error reading relay log configuration.");
-CALL mtr.add_suppression("Replica: Failed to initialize the connection metadata structure for channel ''; its record may still be present in the applier metadata repository, consider deleting it*");
+CALL mtr.add_suppression("Replica: Failed to initialize the connection metadata structure for channel ''; its record may still be present in the applier metadata repository, consider deleting it.");
 CALL mtr.add_suppression("Failed to create or recover replication info repositories.");
 CALL mtr.add_suppression("Replica SQL for channel '': Replica failed to initialize applier metadata structure from the repository,*");
 CALL mtr.add_suppression("Using ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS implies limitations on the replication topology*");
diff --git a/mysql-test/suite/rpl/r/rpl_mts_rec_crash_safe_small.result b/mysql-test/suite/rpl/r/rpl_mts_rec_crash_safe_small.result
diff --git a/mysql-test/suite/rpl/t/rpl_change_master_without_stopping_slave.test b/mysql-test/suite/rpl/t/rpl_change_master_without_stopping_slave.test
@@ -33,10 +33,11 @@
 #  WL#6120- Change master without stopping Slave threads.
 #
 
+--source include/have_binlog_format_row.inc
+--source include/not_rpl_gtid_only.inc
 --let $rpl_privilege_checks_user_grant_option = 1
 --source include/rpl/set_privilege_checks_user_as_system_user.inc
 --source include/rpl/init_source_replica.inc
---source include/have_binlog_format_row.inc
 
 --echo
 --echo # Create a replication user to use in CHANGE REPLICATION SOURCE tests.
diff --git a/mysql-test/suite/rpl/t/rpl_inconsistent_logical_timestamp_replica_parallel_workers.test b/mysql-test/suite/rpl/t/rpl_inconsistent_logical_timestamp_replica_parallel_workers.test
@@ -28,6 +28,7 @@
 --source include/big_test.inc
 --source include/have_debug.inc
 --source include/have_binlog_format_row.inc
+--source include/have_gtid_mode_off.inc
 
 # This test needs at least 2 applier workers
 --let $option_name = replica_parallel_workers
diff --git a/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.test b/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.test
@@ -197,7 +197,7 @@ UPDATE mysql.slave_relay_log_info SET Number_of_lines = 12;
 
 --let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_TYPE = 'OFF'`
 --let $assert_text = Check the number of channels with ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_TYPE set to OFF
---let $assert_cond = $count = 2 # The recovery channel wont appear unless we start GR
+--let $assert_cond = $count = 3
 --source include/assert.inc
 
 --let $count = `SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_TYPE = 'OFF' AND ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS_VALUE = ''`
@@ -310,7 +310,7 @@ RESET REPLICA ALL;
 --remove_file $MYSQL_TMP_DIR/check_assign_gtids_to_anonymous_transactions_in_table_repo.inc
 
 CALL mtr.add_suppression("Error reading relay log configuration.");
-CALL mtr.add_suppression("Replica: Failed to initialize the connection metadata structure for channel ''; its record may still be present in the applier metadata repository, consider deleting it*");
+CALL mtr.add_suppression("Replica: Failed to initialize the connection metadata structure for channel ''; its record may still be present in the applier metadata repository, consider deleting it.");
 CALL mtr.add_suppression("Failed to create or recover replication info repositories.");
 CALL mtr.add_suppression("Replica SQL for channel '': Replica failed to initialize applier metadata structure from the repository,*");
 CALL mtr.add_suppression("Using ASSIGN_GTIDS_TO_ANONYMOUS_TRANSACTIONS implies limitations on the replication topology*");
diff --git a/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check.test b/mysql-test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check.test
@@ -227,7 +227,7 @@ UPDATE mysql.slave_relay_log_info SET Number_of_lines = 11;
 
 --let $count = `SELECT COUNT(*) FROM performance_schema.replication_applier_configuration WHERE REQUIRE_TABLE_PRIMARY_KEY_CHECK = 'STREAM'`
 --let $assert_text = Check the number of channels with REQUIRE_TABLE_PRIMARY_KEY_CHECK set to STREAM
---let $assert_cond = $count = 2 # The recovery channel wont appear unless we start GR
+--let $assert_cond = $count = 3
 --source include/assert.inc
 
 --let $count = `SELECT COUNT(*) FROM mysql.slave_relay_log_info WHERE REQUIRE_TABLE_PRIMARY_KEY_CHECK = 'STREAM'`
diff --git a/mysql-test/suite/rpl/t/rpl_mts_rec_crash_safe_small.test b/mysql-test/suite/rpl/t/rpl_mts_rec_crash_safe_small.test
diff --git a/mysql-test/suite/rpl/t/rpl_multi_source_init_failure.test b/mysql-test/suite/rpl/t/rpl_multi_source_init_failure.test
@@ -1,4 +1,5 @@
 --source include/have_binlog_format_row.inc
+--source include/not_rpl_gtid_only.inc
 --source include/rpl/init_source_replica.inc
 
 --source include/rpl/connection_replica.inc
diff --git a/mysql-test/suite/rpl/t/rpl_relay_log_rotation_on_worker_failure.test b/mysql-test/suite/rpl/t/rpl_relay_log_rotation_on_worker_failure.test
@@ -28,6 +28,7 @@
 --source include/have_debug_sync.inc
 --source include/have_binlog_format_row.inc
 --source include/have_replica_parallel_workers.inc
+--source include/have_replica_parallel_type_logical_clock.inc
 
 --echo
 --echo ##############################################################
diff --git a/mysql-test/suite/rpl/t/rpl_relay_log_space_limit_net_write_timeout.test b/mysql-test/suite/rpl/t/rpl_relay_log_space_limit_net_write_timeout.test
@@ -74,6 +74,7 @@
 --source include/big_test.inc
 
 --source include/have_binlog_format_row.inc
+--source include/not_have_privilege_checks_user.inc
 
 --let $rpl_skip_start_slave=1
 --source include/rpl/init_source_replica.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_non_trans_mix_engine_warning.test b/mysql-test/suite/rpl/t/rpl_stm_non_trans_mix_engine_warning.test
@@ -19,6 +19,7 @@
 
 --source include/big_test.inc
 --source include/have_binlog_format_statement.inc
+--source include/not_have_privilege_checks_user.inc
 --source include/rpl/init_source_replica.inc
 
 #suppress warning
diff --git a/mysql-test/suite/rpl_gtid/r/rpl_gtid_parallel_pitr.result b/mysql-test/suite/rpl_gtid/r/rpl_gtid_parallel_pitr.result
@@ -33,4 +33,6 @@ START REPLICA SQL_THREAD FOR CHANNEL 'pitr';
 # 5. Wait for expected gtid set on server_2
 
 include/rpl/sync_with_saved.inc
+include/rpl/stop_replica.inc [FOR CHANNEL 'pitr']
+RESET REPLICA ALL FOR CHANNEL 'pitr';
 include/rpl/deinit.inc
diff --git a/mysql-test/suite/rpl_gtid/t/rpl_gtid_parallel_pitr.test b/mysql-test/suite/rpl_gtid/t/rpl_gtid_parallel_pitr.test
@@ -98,6 +98,11 @@ START REPLICA SQL_THREAD FOR CHANNEL 'pitr';
 
 --source include/rpl/sync_with_saved.inc
 
+--let $rpl_channel_name= 'pitr'
+--source include/rpl/stop_replica.inc
+--let $rpl_channel_name=
+RESET REPLICA ALL FOR CHANNEL 'pitr';
+
 # Clean up
 --remove_file $server_2_datadir/binlog-pitr.index.bak
 
diff --git a/mysql-test/suite/rpl_gtid/t/rpl_mysqlbinlog_gtid_on.test b/mysql-test/suite/rpl_gtid/t/rpl_mysqlbinlog_gtid_on.test
@@ -39,8 +39,9 @@
 
 # Output from mysqlbinlog is replayed on the slave server.
 --source include/not_have_privilege_checks_user.inc
---source include/rpl/init_source_replica.inc
 --source include/have_binlog_format_row.inc
+--source include/not_rpl_gtid_only.inc
+--source include/rpl/init_source_replica.inc
 
 --connection slave
 --source include/rpl/stop_replica.inc
diff --git a/mysql-test/suite/rpl_gtid/t/rpl_rotate_gtid.test b/mysql-test/suite/rpl_gtid/t/rpl_rotate_gtid.test
@@ -16,10 +16,11 @@
 #               CAUSES A TRX TO LOG WITH A DIFFERENT GTID
 #
 --source include/have_binlog_format_row.inc
---source include/rpl/init_source_replica.inc
 # Test should run only on debug build
 source include/have_debug.inc;
 source include/have_debug_sync.inc;
+--source include/not_rpl_gtid_only.inc
+--source include/rpl/init_source_replica.inc
 
 
 --echo # Preparing the relaylog
diff --git a/mysql-test/suite/rpl_gtid/t/rpl_xa_commit_fail_preceding_trx.test b/mysql-test/suite/rpl_gtid/t/rpl_xa_commit_fail_preceding_trx.test
@@ -41,6 +41,8 @@
 # transactions parallelizable on the replica.
 
 --source include/have_binlog_format_row.inc
+--source include/have_replica_parallel_type_logical_clock.inc
+--source include/have_replica_parallel_workers.inc
 --source include/have_debug_sync.inc
 --let $rpl_extra_connections_per_server = 3
 --source include/rpl/init_source_replica.inc

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`--source include/have_binlog_format_row.inc`
	`2`	`+--source include/not_rpl_gtid_only.inc`
`2`	`3`	`--source include/rpl/init_source_replica.inc`
`3`	`4`
`4`	`5`	`--source include/rpl/connection_replica.inc`