diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-01-01 15:36:56 +0200 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-01-06 00:09:50 +0200 |
| commit | 670b85804ca6d3b0e640a7ddbb5b6e494bec7c2b (patch) | |
| tree | 8a4d503011387a6cb00c1d03a3b8126163da53c6 | |
| parent | b2b6cf492e3c7fd99a2d0b6f152516efd28dadf4 (diff) | |
| download | mariadb-git-670b85804ca6d3b0e640a7ddbb5b6e494bec7c2b.tar.gz | |
Replication tests fail on valgrind due to waiting-related timeouts
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
| -rw-r--r-- | mysql-test/include/sync_slave_sql_with_io.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/sync_with_master_gtid.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/wait_for_slave_param.inc | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/include/sync_slave_sql_with_io.inc b/mysql-test/include/sync_slave_sql_with_io.inc index 8048f7a177c..9efede9a61f 100644 --- a/mysql-test/include/sync_slave_sql_with_io.inc +++ b/mysql-test/include/sync_slave_sql_with_io.inc @@ -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) diff --git a/mysql-test/include/sync_with_master_gtid.inc b/mysql-test/include/sync_with_master_gtid.inc index 97ada8eea29..777711b979c 100644 --- a/mysql-test/include/sync_with_master_gtid.inc +++ b/mysql-test/include/sync_with_master_gtid.inc @@ -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)` diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc index d3f7ec56614..25020d46ed9 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -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 == '') |