revision-id: b286bde2ac3b564b75cb66787454626a04e639c0 (mariadb-10.1.38-63-gb286bde2ac3) parent(s): 6c08174e365c1a2db76e51dedd2a8292464472d6 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-18 08:20:19 +0200 message: MDEV-17847: Galera test failure on MW-328[A|B|C] Infinite procedure eats all CPU time causing test timeout. Lets sleep very small amount of time after every update to avoid it. --- mysql-test/suite/galera/disabled.def | 3 --- mysql-test/suite/galera/r/MW-328A.result | 1 + mysql-test/suite/galera/r/MW-328B.result | 1 + mysql-test/suite/galera/r/MW-328C.result | 1 + mysql-test/suite/galera/t/MW-328-header.inc | 1 + mysql-test/suite/galera/t/MW-328A.test | 3 +-- mysql-test/suite/galera/t/MW-328B.test | 3 +-- mysql-test/suite/galera/t/MW-328C.test | 3 +-- 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 2c0ef3f8e20..c851b97d119 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -11,9 +11,6 @@ ############################################################################## GAL-419 : MDEV-13549 Galera test failures -MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] -MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] -MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C] MW-329 : wsrep_local_replays not stable MW-336 : MDEV-13549 Timeout in wait_condition.inc for PROCESSLIST MW-416 : MDEV-13549 Galera test failures diff --git a/mysql-test/suite/galera/r/MW-328A.result b/mysql-test/suite/galera/r/MW-328A.result index daed2469f11..48b51aa25a7 100644 --- a/mysql-test/suite/galera/r/MW-328A.result +++ b/mysql-test/suite/galera/r/MW-328A.result @@ -7,6 +7,7 @@ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END; SET SESSION wsrep_sync_wait = 0; WHILE 1 DO UPDATE t1 SET f2 = LEFT(MD5(RAND()), 4); +DO SLEEP(0.1); END WHILE; END| CALL proc_update();; diff --git a/mysql-test/suite/galera/r/MW-328B.result b/mysql-test/suite/galera/r/MW-328B.result index 780988938f6..706940ba7af 100644 --- a/mysql-test/suite/galera/r/MW-328B.result +++ b/mysql-test/suite/galera/r/MW-328B.result @@ -7,6 +7,7 @@ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END; SET SESSION wsrep_sync_wait = 0; WHILE 1 DO UPDATE t1 SET f2 = LEFT(MD5(RAND()), 4); +DO SLEEP(0.1); END WHILE; END| CALL proc_update();; diff --git a/mysql-test/suite/galera/r/MW-328C.result b/mysql-test/suite/galera/r/MW-328C.result index 5cd74f05171..889036b2a0b 100644 --- a/mysql-test/suite/galera/r/MW-328C.result +++ b/mysql-test/suite/galera/r/MW-328C.result @@ -7,6 +7,7 @@ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END; SET SESSION wsrep_sync_wait = 0; WHILE 1 DO UPDATE t1 SET f2 = LEFT(MD5(RAND()), 4); +DO SLEEP(0.1); END WHILE; END| CALL proc_update();; diff --git a/mysql-test/suite/galera/t/MW-328-header.inc b/mysql-test/suite/galera/t/MW-328-header.inc index f0a6ccaccc6..b4fc1511549 100644 --- a/mysql-test/suite/galera/t/MW-328-header.inc +++ b/mysql-test/suite/galera/t/MW-328-header.inc @@ -18,6 +18,7 @@ BEGIN SET SESSION wsrep_sync_wait = 0; WHILE 1 DO UPDATE t1 SET f2 = LEFT(MD5(RAND()), 4); + DO SLEEP(0.1); END WHILE; END| diff --git a/mysql-test/suite/galera/t/MW-328A.test b/mysql-test/suite/galera/t/MW-328A.test index 09aad1bcf60..34d8dba1f19 100644 --- a/mysql-test/suite/galera/t/MW-328A.test +++ b/mysql-test/suite/galera/t/MW-328A.test @@ -9,11 +9,10 @@ --source include/big_test.inc --source include/galera_cluster.inc ---source include/have_innodb.inc --source suite/galera/t/MW-328-header.inc --connection node_2 ---let $count = 100 +--let $count = 200 --let $successes = 0 --let $deadlocks = 0 diff --git a/mysql-test/suite/galera/t/MW-328B.test b/mysql-test/suite/galera/t/MW-328B.test index 000b0d8a9ab..f43300d3d53 100644 --- a/mysql-test/suite/galera/t/MW-328B.test +++ b/mysql-test/suite/galera/t/MW-328B.test @@ -9,11 +9,10 @@ --source include/big_test.inc --source include/galera_cluster.inc ---source include/have_innodb.inc --source suite/galera/t/MW-328-header.inc --connection node_2 ---let $count = 100 +--let $count = 200 SET SESSION wsrep_retry_autocommit = 0; diff --git a/mysql-test/suite/galera/t/MW-328C.test b/mysql-test/suite/galera/t/MW-328C.test index 72a8480923c..a81071e5336 100644 --- a/mysql-test/suite/galera/t/MW-328C.test +++ b/mysql-test/suite/galera/t/MW-328C.test @@ -9,11 +9,10 @@ --source include/big_test.inc --source include/galera_cluster.inc ---source include/have_innodb.inc --source suite/galera/t/MW-328-header.inc --connection node_2 ---let $count = 100 +--let $count = 200 SET SESSION wsrep_retry_autocommit = 10000;