mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/include/start_slave.inc

22 lines
567 B
PHP
Raw Normal View History

BUG#37975: wait_for_slave_* should increase the timeout Post-push fixes: I forgot to include the new files start_slave.inc and stop_slave.inc in the previuos push. mysql-test/include/start_slave.inc: Added file. Purpose: start slave synchronously, waiting for the two threads to start. mysql-test/include/stop_slave.inc: Added file. Purpose: stop slave synchronously, waiting for the two threads to stop.
2008-07-14 11:41:23 +02:00
# ==== Purpose ====
#
# Issues START SLAVE on the current connection. Then waits until both
# the IO and SQL threads have started, or until a timeout is reached.
#
# Please use this instead of 'START SLAVE', to reduce the risk of test
# case bugs.
#
# ==== Usage ====
#
# source include/wait_for_slave_to_start.inc;
#
# Parameters to this macro are $slave_timeout and
BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild 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. mysql-test/extra/rpl_tests/rpl_conflicts.test: rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed: The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test just set some parameters, and then source include/rpl_tests/rpl_conflicts.test. Also, cleaned up the test case a bit, and fixed BUG#37718. mysql-test/include/show_rpl_debug_info.inc: Factored out the debug printing code from wait_for_slave_param.inc to a new file, show_rpl_debug_info.inc. Also removed the $slave_keep_connection parameter, and replaced it by $master_connection. This allows printing debug info on the master, no matter what the name of the master connection is. mysql-test/include/start_slave.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/stop_slave.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/sync_slave_io_with_master.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/wait_for_slave_io_to_start.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/wait_for_slave_io_to_stop.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/wait_for_slave_param.inc: Factored out the debug printing code from wait_for_slave_param.inc to a new file, show_rpl_debug_info.inc. Also removed the $slave_keep_connection parameter, and replaced it by $master_connection. This allows printing debug info on the master, no matter what the name of the master connection is. Had to move the printing of debug info out of the while loop because of BUG number 41913. mysql-test/include/wait_for_slave_sql_error.inc: Made it wait until the slave sql thread has stopped. This takes very short time and avoids race condition bugs in test cases (e.g., fixes BUG#37718). Replaced $slave_keep_connection by $master_connection. mysql-test/include/wait_for_slave_sql_error_and_skip.inc: Since wait_for_slave_sql_error now waits for the slave sql thread to stop too, wait_for_slave_sql_error_and_skip does not have to wait for the slave sql thread to stop. Also, since wait_for_slave_sql_error now requires the parameter $slave_sql_errno to be set, wait_for_slave_sql_error_and_skip requires that as well: updated the usage instructions. mysql-test/include/wait_for_slave_sql_to_start.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/wait_for_slave_sql_to_stop.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/wait_for_slave_to_start.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/include/wait_for_slave_to_stop.inc: Replaced $slave_keep_connection by $master_connection. mysql-test/suite/rpl/r/rpl_row_conflicts.result: update result file mysql-test/suite/rpl/r/rpl_stm_conflicts.result: update result file mysql-test/suite/rpl/t/rpl_dual_pos_advance.test: Replaced $slave_keep_connection by $master_connection. mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test: Set $slave_sql_errno, since it is now required. Add dollar sign to $show_sql_error (without dollar sign, mtr makes it an environment variable). mysql-test/suite/rpl/t/rpl_row_conflicts.test: rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed: The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test just set some parameters, and then source include/rpl_tests/rpl_conflicts.test. Also, cleaned up the test case a bit, and fixed BUG#37718. mysql-test/suite/rpl/t/rpl_row_mystery22.test: rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed: The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test just set some parameters, and then source include/rpl_tests/rpl_conflicts.test. Also, cleaned up the test case a bit, and fixed BUG#37718. mysql-test/suite/rpl/t/rpl_stm_conflicts.test: rpl_stm_mystery22 and rpl_row_mystery22 have now been refactored and renamed: The two test cases rpl.rpl_stm_conflicts.test and rpl.rpl_row_conflicts.test just set some parameters, and then source include/rpl_tests/rpl_conflicts.test. Also, cleaned up the test case a bit, and fixed BUG#37718.
2009-01-09 15:12:31 +01:00
# $master_connection. See wait_for_slave_param.inc for
BUG#37975: wait_for_slave_* should increase the timeout Post-push fixes: I forgot to include the new files start_slave.inc and stop_slave.inc in the previuos push. mysql-test/include/start_slave.inc: Added file. Purpose: start slave synchronously, waiting for the two threads to start. mysql-test/include/stop_slave.inc: Added file. Purpose: stop slave synchronously, waiting for the two threads to stop.
2008-07-14 11:41:23 +02:00
# descriptions.
--disable_query_log
START SLAVE;
--enable_query_log
--echo include/start_slave.inc
source include/wait_for_slave_to_start.inc;
Reference in a new issue Copy permalink