database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-28953 sporadic failures with galera_sr.mysql-wsrep-features#165

Browse Source 
Modified galera_sr.mysql-wsrep-features#165 test to be deterministic:
Added one wait condition to catch execution state after --send command.
Changed another wait condition to better match the execution state of the test thread.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
This commit is contained in:
tommijkl
2022-06-20 15:24:22 +03:00
committed by Julius Goryavsky
parent 1dc6ded8b1
commit 00a81516b0
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/suite/galera_sr/r/mysql-wsrep-features#165.result
View File

@@ -26,6 +26,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -91,6 +92,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -156,6 +158,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -221,6 +224,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -286,6 +290,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -351,6 +356,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -416,6 +422,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -481,6 +488,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -546,6 +554,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -611,6 +620,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -676,6 +686,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -741,6 +752,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -806,6 +818,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -871,6 +884,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -936,6 +950,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2
@@ -1001,6 +1016,7 @@ f1 f2
connection node_1c; connection node_1c;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
INSERT INTO t1 VALUES (3, 'c'); INSERT INTO t1 VALUES (3, 'c');
connection node_1;
connection node_2; connection node_2;
SELECT * FROM t1; SELECT * FROM t1;
f1 f2 f1 f2

6
mysql-test/suite/galera_sr/t/mysql-wsrep-features#165.inc
View File

@@ -46,6 +46,10 @@ SELECT * FROM t1;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
--send INSERT INTO t1 VALUES (3, 'c') --send INSERT INTO t1 VALUES (3, 'c')
--connection node_1
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
--source include/wait_condition.inc
--connection node_2 --connection node_2
SELECT * FROM t1; SELECT * FROM t1;
@@ -54,7 +58,7 @@ SELECT * FROM t1;
--send UPDATE t1 SET f2 = 'a' WHERE f1 = 2 --send UPDATE t1 SET f2 = 'a' WHERE f1 = 2
--connection node_1 --connection node_1
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER != 'system user' AND STATE = 'Updating'; --let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
--source include/wait_condition.inc --source include/wait_condition.inc
# Will deadlock # Will deadlock