summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-01-03 15:33:39 +0100
committerunknown <knielsen@knielsen-hq.org>2011-01-03 15:33:39 +0100
commitbf14edc2510cdbfe509f6359f55b89ca518446f5 (patch)
treecbb5a7caf6b26fb72671bfa4986a8d4b6b1f9903 /mysql-test/suite/maria
parentb62420874e09941a53b82a4afdd8b0a5a23ade88 (diff)
downloadmariadb-git-bf14edc2510cdbfe509f6359f55b89ca518446f5.tar.gz
Speed up `mtr --parallel=<lots>` by scheduling some slow tests earlier.
The patch also fixes a race in rpl_stop_slave.test. On machines with lots of CPU and memory, something like `mtr --parallel=10` can speed up the test suite enormously. However, we have a few test cases that run for long (several minutes), and if we are unlucky and happen to schedule those towards the end of the test suite, we end up with most workers idle while waiting for the last slow test to end, significantly delaying the finish of the entire suite. Improve this by marking the offending tests as taking "long", and trying to schedule those tests early. This reduces the time towards the end of the test suite run where some workers are waiting with nothing to do for the remaining workers each to finish their last test. Also, the rpl_stop_slave test had a race which could cause it to take a 300 seconds debug_sync timeout; this is fixed. Testing on a 4-core 8GB machine, this patch speeds up the test suite with around 30% for --parallel=10 (debug build), allowing to run the entire suite in 5 minutes.
Diffstat (limited to 'mysql-test/suite/maria')
-rw-r--r--mysql-test/suite/maria/t/maria-recovery-rtree-ft.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
index 3ede5002b72..ac71be376f1 100644
--- a/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
+++ b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
@@ -6,6 +6,7 @@
# Binary must be compiled with debug for crash to occur
--source include/have_debug.inc
--source include/have_maria.inc
+--source include/long_test.inc
set global maria_log_file_size=4294967295;
let $MARIA_LOG=.;