mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
3889dffcc0
Problem 1: The test waits for an error in the slave sql thread,
then resolves the error and issues 'start slave'. However, there
is a gap between when the error is reported and the slave sql
thread stops. If this gap was long, the slave would still be
running when 'start slave' happened, so 'start slave' would fail
and cause a test failure.
Fix 1: Made wait_for_slave_sql_error wait for the slave to stop
instead of wait for error in the IO thread. After stopping, the
error code is verified. If the error code is wrong, debug info
is printed. To print debug info, the debug printing code in
wait_for_slave_param.inc was moved out to a new file,
show_rpl_debug_info.inc.
Problem 2: rpl_stm_mystery22 is a horrible name, the comments in
the file didn't explain anything useful, the test was generally
hard to follow, and the test was essentially duplicated between
rpl_stm_mystery22 and rpl_row_mystery22.
Fix 2: The test is about conflicts in the slave SQL thread,
hence I renamed the tests to rpl_{stm,row}_conflicts. Refactored
the test so that the work is done in
extra/rpl_tests/rpl_conflicts.inc, and
rpl.rpl_{row,stm}_conflicts merely sets some variables and then
sourced extra/rpl_tests/rpl_conflicts.inc.
The tests have been rewritten and comments added.
Problem 3: When calling wait_for_slave_sql_error.inc, you always
want to verify that the sql thread stops because of the expected
error and not because of some other error. Currently,
wait_for_slave_sql_error.inc allows the caller to omit the error
code, in which case all error codes are accepted.
Fix 3: Made wait_for_slave_sql_error.inc fail if no error code
is given. Updated rpl_filter_tables_not_exist accordingly.
Problem 4: rpl_filter_tables_not_exist had a typo, the dollar
sign was missing in a 'let' statement.
Fix 4: Added dollar sign.
Problem 5: When replicating from other servers than the one named
'master', the wait_for_slave_* macros were unable to print debug
info on the master.
Fix 5: Replace parameter $slave_keep_connection by
$master_connection.
36 lines
1,014 B
PHP
36 lines
1,014 B
PHP
# ==== Purpose ====
|
|
#
|
|
# Waits until the slave IO thread has been synced, i.e., all events
|
|
# have been copied over to slave. Does not care if the SQL thread is
|
|
# in sync.
|
|
#
|
|
#
|
|
# ==== Usage ====
|
|
#
|
|
# source include/sync_slave_io_with_master.inc;
|
|
#
|
|
# Syncs to the current position on master, as found by SHOW MASTER
|
|
# STATUS.
|
|
#
|
|
# Must be called on the master. Will change connection to the slave.
|
|
#
|
|
# Parameters to this macro are $slave_timeout and
|
|
# $master_connection. See wait_for_slave_param.inc for
|
|
# descriptions.
|
|
|
|
let $_master_file= query_get_value("SHOW MASTER STATUS", File, 1);
|
|
let $_master_pos= query_get_value("SHOW MASTER STATUS", Position, 1);
|
|
|
|
connection slave;
|
|
|
|
let $slave_error_message= Failed while waiting for slave IO thread to sync;
|
|
|
|
let $slave_param= Master_Log_File;
|
|
let $slave_param_value= $_master_file;
|
|
source include/wait_for_slave_param.inc;
|
|
|
|
let $slave_param= Read_Master_Log_Pos;
|
|
let $slave_param_value= $_master_pos;
|
|
source include/wait_for_slave_param.inc;
|
|
|
|
let $slave_error_message= ;
|