1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-26: Global transaction ID.

Browse Source 
Fix yet another race in the rpl_gtid_startpos test case.

Implement include/wait_for_purge.inc to purge binary logs; we need to
retry the purge multiple times until it succeeds in removing all the logs
we want, as binlog dump threads can be slow to stop on loaded machines and
hold back purge of logs that are still referenced by the thread.
This commit is contained in:
unknown 2013-03-29 11:49:54 +01:00
parent 5aaf73fcaa
commit 0f266bc80e
3 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mysql-test/include/wait_for_purge.inc Normal file
View File

@ -0,0 +1,53 @@
# include/wait_for_purge.inc
#
# SUMMARY
#
# Repeatedly attempt to purge binlogs up to a specific point, until
# SHOW BINARY LOGS shows it has succeeded.
# This can be useful to avoid races where slaves are stopped but the
# corresponding binlog dump thread on the master has not yet terminated.
# Async binlog checkpoints can also delay purge.
#
# Note that it may be necessary to inject at least one event in the binlog
# after stopping slaves, or master may not detect stop of slave for a long
# time (or forever), depending on details of test case, if replication
# heartbeat is enabled, etc.
#
# USAGE:
#
# --let $purge_binlogs_to=master-bin.000003
# --source include/wait_for_purge.inc
#
# SIDE EFFECTS:
#
# Disables --query_log while running, enables it afterwards.
--echo include/wait_for_purge.inc "$purge_binlogs_to"
let $_wait_count= 300;
let $_done= 0;
--disable_query_log
while ($_wait_count)
{
dec $_wait_count;
eval PURGE BINARY LOGS TO "$purge_binlogs_to";
let $_cur_binlog= query_get_value(SHOW BINARY LOGS, Log_name, 1);
if (`SELECT "$_cur_binlog" = "$purge_binlogs_to"`)
{
let $_done= 1;
let $_wait_count= 0;
}
if ($_wait_count)
{
real_sleep 0.1;
}
}
if (!$_done)
{
SHOW FULL PROCESSLIST;
eval SHOW BINARY LOGS;
--die ERROR: failed while waiting for binlog purge to $purge_binlogs_to
}
--enable_query_log

4
mysql-test/suite/rpl/r/rpl_gtid_startpos.result
View File

@ -19,7 +19,7 @@ include/stop_slave.inc
*** Test that master gives error when slave asks for empty gtid pos and binlog files have been purged. ***
FLUSH LOGS;
INSERT INTO t1 VALUES (2);
PURGE BINARY LOGS TO 'master-bin.000003';
include/wait_for_purge.inc "master-bin.000003"
show binary logs;
Log_name File_size
master-bin.000003 #
@ -135,7 +135,7 @@ INSERT INTO t1 VALUES (4);
include/stop_slave.inc
FLUSH LOGS;
FLUSH LOGS;
PURGE BINARY LOGS TO 'master-bin.000004';
include/wait_for_purge.inc "master-bin.000004"
show binary logs;
Log_name File_size
master-bin.000004 #

8
mysql-test/suite/rpl/t/rpl_gtid_startpos.test
View File

@ -35,10 +35,10 @@ SELECT * FROM t1;
--echo *** Test that master gives error when slave asks for empty gtid pos and binlog files have been purged. ***
--connection server_1
FLUSH LOGS;
--source include/wait_for_binlog_checkpoint.inc
INSERT INTO t1 VALUES (2);
--save_master_pos
PURGE BINARY LOGS TO 'master-bin.000003';
--let $purge_binlogs_to=master-bin.000003
--source include/wait_for_purge.inc
--source include/show_binary_logs.inc
--connection server_2
@ -226,8 +226,8 @@ INSERT INTO t1 VALUES (4);
--connection server_1
FLUSH LOGS;
FLUSH LOGS;
--source include/wait_for_binlog_checkpoint.inc
PURGE BINARY LOGS TO 'master-bin.000004';
--let $purge_binlogs_to=master-bin.000004
--source include/wait_for_purge.inc
--source include/show_binary_logs.inc
INSERT INTO t1 VALUES (5);