mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52: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.
36 lines
844 B
PHP
36 lines
844 B
PHP
# Check that server has come out ot readonly mode
|
|
#
|
|
# wait for server to connect properly to cluster
|
|
#
|
|
|
|
--disable_query_log
|
|
|
|
set @saved_log = @@sql_log_bin;
|
|
set sql_log_bin = 0;
|
|
--error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND
|
|
delete from mysql.ndb_apply_status where server_id=0;
|
|
let $mysql_errno= 1;
|
|
let $counter= 600;
|
|
while ($mysql_errno)
|
|
{
|
|
# Table is readonly until the mysqld has connected properly
|
|
--error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG
|
|
replace into mysql.ndb_apply_status values(0,0,"",0,0);
|
|
if ($mysql_errno)
|
|
{
|
|
if (!$counter)
|
|
{
|
|
die Failed while waiting for mysqld to come out of readonly mode;
|
|
}
|
|
dec $counter;
|
|
--sleep 0.1
|
|
}
|
|
}
|
|
delete from mysql.ndb_apply_status where server_id=0;
|
|
set sql_log_bin = @saved_log;
|
|
|
|
--enable_query_log
|
|
|
|
#
|
|
# connected
|
|
#
|