Skip to content

Commit

Permalink
mtr: increase timeouts under ASAN/UBSAN/MSAN
Browse files Browse the repository at this point in the history
not only under valgrind
  • Loading branch information
vuvova committed Mar 28, 2024
1 parent 65674bd commit 389f305
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 20 deletions.
7 changes: 2 additions & 5 deletions mysql-test/include/shutdown_mysqld.inc
Expand Up @@ -31,11 +31,8 @@ if ($rpl_inited)
set @@global.log_warnings=0;
--enable_query_log

--let $server_shutdown_timeout= 60
if ($VALGRIND_TEST)
{
--let $server_shutdown_timeout= 300
}
--source include/slow_environ.inc
--let $server_shutdown_timeout= 60$_timeout_adjustment

if ($shutdown_timeout)
{
Expand Down
9 changes: 9 additions & 0 deletions mysql-test/include/slow_environ.inc
@@ -0,0 +1,9 @@
if (!$slow_environ_check)
{
let $_timeout_adjustment=;
if (`select $VALGRIND_TEST + count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like '%SAN%'`)
{
let $_timeout_adjustment=0;
}
let $slow_environ_check=1;
}
7 changes: 2 additions & 5 deletions mysql-test/include/sync_slave_sql_with_io.inc
Expand Up @@ -25,11 +25,8 @@
let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout)
{
let $_slave_timeout= 300;
if ($VALGRIND_TEST)
{
let $_slave_timeout= 1500;
}
source include/slow_environ.inc;
let $_slave_timeout= 300$_timeout_adjustment;
}

--let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1)
Expand Down
7 changes: 2 additions & 5 deletions mysql-test/include/sync_with_master_gtid.inc
Expand Up @@ -33,11 +33,8 @@
let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout)
{
let $_slave_timeout= 120;
if ($VALGRIND_TEST)
{
let $_slave_timeout= 1200;
}
source include/slow_environ.inc;
let $_slave_timeout= 120$_timeout_adjustment;
}

--let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)`
Expand Down
7 changes: 2 additions & 5 deletions mysql-test/include/wait_for_slave_param.inc
Expand Up @@ -49,11 +49,8 @@
let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout)
{
let $_slave_timeout= 300;
if ($VALGRIND_TEST)
{
let $_slave_timeout= 1500;
}
source include/slow_environ.inc;
let $_slave_timeout= 300$_timeout_adjustment;
}

let $_slave_param_comparison= $slave_param_comparison;
Expand Down

0 comments on commit 389f305

Please sign in to comment.