Commit fc6711c6 authored by Sergei Golubchik's avatar Sergei Golubchik

mtr: increase timeouts under ASAN/UBSAN/MSAN

not only under valgrind
parent bd0e7515
...@@ -31,11 +31,8 @@ if ($rpl_inited) ...@@ -31,11 +31,8 @@ if ($rpl_inited)
set @@global.log_warnings=0; set @@global.log_warnings=0;
--enable_query_log --enable_query_log
--let $server_shutdown_timeout= 60 --source include/slow_environ.inc
if ($VALGRIND_TEST) --let $server_shutdown_timeout= 60$_timeout_adjustment
{
--let $server_shutdown_timeout= 300
}
if ($shutdown_timeout) if ($shutdown_timeout)
{ {
......
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;
}
...@@ -25,11 +25,8 @@ ...@@ -25,11 +25,8 @@
let $_slave_timeout= $slave_timeout; let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout) if (!$_slave_timeout)
{ {
let $_slave_timeout= 300; source include/slow_environ.inc;
if ($VALGRIND_TEST) let $_slave_timeout= 300$_timeout_adjustment;
{
let $_slave_timeout= 1500;
}
} }
--let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1) --let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1)
......
...@@ -33,11 +33,8 @@ ...@@ -33,11 +33,8 @@
let $_slave_timeout= $slave_timeout; let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout) if (!$_slave_timeout)
{ {
let $_slave_timeout= 120; source include/slow_environ.inc;
if ($VALGRIND_TEST) let $_slave_timeout= 120$_timeout_adjustment;
{
let $_slave_timeout= 1200;
}
} }
--let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)` --let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)`
......
...@@ -49,11 +49,8 @@ ...@@ -49,11 +49,8 @@
let $_slave_timeout= $slave_timeout; let $_slave_timeout= $slave_timeout;
if (!$_slave_timeout) if (!$_slave_timeout)
{ {
let $_slave_timeout= 300; source include/slow_environ.inc;
if ($VALGRIND_TEST) let $_slave_timeout= 300$_timeout_adjustment;
{
let $_slave_timeout= 1500;
}
} }
let $_slave_param_comparison= $slave_param_comparison; let $_slave_param_comparison= $slave_param_comparison;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment