mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replication tests fail on valgrind due to waiting-related timeouts

Browse source 
MTR raises default wait_for_pos_timeout from 300 to 1500 when tests
are run with valgrind. The same needs to be done for other
replication-related waits.

The change should fix one of failures mentioned in MDEV-10653
(rpl.rpl_parallel fails in buildbot with timeout), the one
on the valgrind builder; but not all of them
This commit is contained in:
Elena Stepanova 2017-01-01 15:36:56 +02:00
commit 670b85804c
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/include/sync_slave_sql_with_io.inc
View file

@ -26,6 +26,10 @@ let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout)
{
let $_slave_timeout= 300;
if ($VALGRIND_TEST)
{
let $_slave_timeout= 1500;
}
}
--let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1)

4
mysql-test/include/sync_with_master_gtid.inc
View file

@ -34,6 +34,10 @@ let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout)
{
let $_slave_timeout= 120;
if ($VALGRIND_TEST)
{
let $_slave_timeout= 1200;
}
}
--let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)`

4
mysql-test/include/wait_for_slave_param.inc
View file

@ -50,6 +50,10 @@ let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout)
{
let $_slave_timeout= 300;
if ($VALGRIND_TEST)
{
let $_slave_timeout= 1500;
}
}
if ($slave_error_param == '')