mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
09c80e12c5
Major replication test framework cleanup. This does the following:
- Ensure that all tests clean up the replication state when they
finish, by making check-testcase check the output of SHOW SLAVE STATUS.
This implies:
- Slave must not be running after test finished. This is good
because it removes the risk for sporadic errors in subsequent
tests when a test forgets to sync correctly.
- Slave SQL and IO errors must be cleared when test ends. This is
good because we will notice if a test gets an unexpected error in
the slave threads near the end.
- We no longer have to clean up before a test starts.
- Ensure that all tests that wait for an error in one of the slave
threads waits for a specific error. It is no longer possible to
source wait_for_slave_[sql|io]_to_stop.inc when there is an error
in one of the slave threads. This is good because:
- If a test expects an error but there is a bug that causes
another error to happen, or if it stops the slave thread without
an error, then we will notice.
- When developing tests, wait_for_*_to_[start|stop].inc will fail
immediately if there is an error in the relevant slave thread.
Before this patch, we had to wait for the timeout.
- Remove duplicated and repeated code for setting up unusual replication
topologies. Now, there is a single file that is capable of setting
up arbitrary topologies (include/rpl_init.inc, but
include/master-slave.inc is still available for the most common
topology). Tests can now end with include/rpl_end.inc, which will clean
up correctly no matter what topology is used. The topology can be
changed with include/rpl_change_topology.inc.
- Improved debug information when tests fail. This includes:
- debug info is printed on all servers configured by include/rpl_init.inc
- User can set $rpl_debug=1, which makes auxiliary replication files
print relevant debug info.
- Improved documentation for all auxiliary replication files. Now they
describe purpose, usage, parameters, and side effects.
- Many small code cleanups:
- Made have_innodb.inc output a sensible error message.
- Moved contents of rpl000017-slave.sh into rpl000017.test
- Added mysqltest variables that expose the current state of
disable_warnings/enable_warnings and friends.
- Too many to list here: see per-file comments for details.
79 lines
2.4 KiB
PHP
79 lines
2.4 KiB
PHP
# ==== Purpose ====
|
|
#
|
|
# See include/begin_include_file.inc
|
|
#
|
|
#
|
|
# ==== Usage ====
|
|
#
|
|
# # At the end of include/my_file.inc:
|
|
# --let $include_filename= my_file.inc
|
|
# [--let $skip_restore_connection= 1]
|
|
# [--let $rpl_debug= 1]
|
|
# --source include/begin_include_file.inc
|
|
#
|
|
# Parameters:
|
|
# $include_filename
|
|
# Name of file that sources this file.
|
|
#
|
|
# $skip_restore_connection
|
|
# By default, this script restores the connection that was active
|
|
# when begin_include_file.inc was sourced. If
|
|
# $skip_restore_connection is set, then this step is skipped and
|
|
# end_include_file.inc leaves the connection as it was before
|
|
# end_include_file.inc was sourced.
|
|
|
|
--let $_tmp= `SELECT SUBSTRING('$_include_file_enabled_warnings', 1, 1)`
|
|
--let $_include_file_enabled_warnings= `SELECT SUBSTRING('$_include_file_enabled_warnings', 2)`
|
|
if ($_tmp) {
|
|
--enable_warnings
|
|
}
|
|
if (!$_tmp) {
|
|
--disable_warnings
|
|
}
|
|
|
|
--let $_tmp= `SELECT SUBSTRING('$_include_file_enabled_query_log', 1, 1)`
|
|
--let $_include_file_enabled_query_log= `SELECT SUBSTRING('$_include_file_enabled_query_log', 2)`
|
|
if ($_tmp) {
|
|
--enable_query_log
|
|
}
|
|
if (!$_tmp) {
|
|
--disable_query_log
|
|
}
|
|
|
|
--let $_tmp= `SELECT SUBSTRING('$_include_file_enabled_result_log', 1, 1)`
|
|
--let $_include_file_enabled_result_log= `SELECT SUBSTRING('$_include_file_enabled_result_log', 2)`
|
|
if ($_tmp) {
|
|
--enable_result_log
|
|
}
|
|
if (!$_tmp) {
|
|
--disable_result_log
|
|
}
|
|
|
|
--let $_tmp= `SELECT SUBSTRING('$_include_file_enabled_abort_on_error', 1, 1)`
|
|
--let $_include_file_enabled_abort_on_error= `SELECT SUBSTRING('$_include_file_enabled_abort_on_error', 2)`
|
|
if ($_tmp) {
|
|
--enable_abort_on_error
|
|
}
|
|
if (!$_tmp) {
|
|
--disable_abort_on_error
|
|
}
|
|
|
|
--let $_include_file_rpl_connection_name= `SELECT SUBSTRING_INDEX('$_include_file_connection', ',', 1)`
|
|
--let $_include_file_connection= `SELECT SUBSTRING('$_include_file_connection', LENGTH('$_include_file_rpl_connection_name') + 2)`
|
|
if (!$skip_restore_connection)
|
|
{
|
|
--let $rpl_connection_name= $_include_file_rpl_connection_name
|
|
--source include/rpl_connection.inc
|
|
}
|
|
--let $skip_restore_connection= 0
|
|
|
|
|
|
--dec $_include_file_depth
|
|
--let $_include_file_indent= `SELECT REPEAT('.', $_include_file_depth)`
|
|
|
|
if ($rpl_debug)
|
|
{
|
|
--echo $_include_file_indent==== END include/$include_filename ====
|
|
--echo $_include_file_indent con='$CURRENT_CONNECTION' warn='$ENABLED_WARNINGS' qlog='$ENABLED_QUERY_LOG' rlog='$ENABLED_RESULT_LOG' aborterr='$ENABLED_ABORT_ON_ERROR'
|
|
}
|
|
--let $include_filename=
|