database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-32168: slave_error_param condition is never checked from the wait_for_slave_param.inc

Browse Source 
Fix some random test failures following MDEV-32168 push.

Don't blindly set $rpl_only_running_threads in many places. Instead explicit
stop only the IO or SQL thread, as appropriate. Setting it interfered with
rpl_end.inc in some cases. Rather than clearing it afterwards, better to
not set it at all when it is not needed, removing ambiguity in the test
about the state of the replication threads.

Don't fail the test if include/stop_slave_io.inc finds an error in the IO
thread after stop. Such errors can be simply because slave stop happened in
the middle of the IO thread's initial communication with the master.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2023-11-20 21:59:55 +01:00
parent 1ffa8c5072
commit ea4bcb9d98
37 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_coords.result
View File

@ -63,7 +63,7 @@ include/wait_for_slave_io_error.inc [errno=1236]
SHOW TABLES;
Tables_in_test
table1_no_encryption
include/stop_slave.inc
include/stop_slave_sql.inc
reset slave;
##########
# Cleanup

3
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_coords.test
View File

@ -137,8 +137,7 @@ SHOW TABLES;
--disable_connect_log
# IO thread is stopped, stop SQL thread only
--let $rpl_only_running_threads= 1
--source include/stop_slave.inc
--source include/stop_slave_sql.inc
--enable_connect_log
reset slave;

2
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_gtid.result
View File

@ -62,7 +62,7 @@ include/wait_for_slave_io_error.inc [errno=1236]
# ..success
SHOW TABLES;
Tables_in_test
include/stop_slave.inc
include/stop_slave_sql.inc
reset slave;
##########
# Cleanup

3
mysql-test/suite/binlog_encryption/encrypted_master_switch_to_unencrypted_gtid.test
View File

@ -133,8 +133,7 @@ SHOW TABLES;
--disable_connect_log
# IO thread is stopped, wait for SQL thread to be stopped
--let $rpl_only_running_threads= 1
--source include/stop_slave.inc
--source include/stop_slave_sql.inc
--enable_connect_log
reset slave;

2
mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.result
View File

@ -192,7 +192,7 @@ SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;
SET GLOBAL max_binlog_stmt_cache_size= ORIGINAL_VALUE;
SET GLOBAL binlog_stmt_cache_size= ORIGINAL_VALUE;
include/stop_slave.inc
include/stop_slave_io.inc
include/start_slave.inc
connection master;
connection slave;

2
mysql-test/suite/binlog_encryption/rpl_parallel_ignored_errors.result
View File

@ -36,7 +36,7 @@ connection con_temp2;
COMMIT;
connection server_2;
include/wait_for_slave_sql_error.inc [errno=1062]
include/stop_slave.inc
include/stop_slave_io.inc
include/assert.inc [table t1 should have zero rows where a>32]
SELECT * FROM t1 WHERE a>32;
a