Skip to content

Commit 38414b2

Browse files
author
Jan Lindström
committed
MDEV-21514 : Galera test failure on galera.galera_wan_restart_sst on Azure
Remove sleeps and unnecessary waits.
1 parent 2cff542 commit 38414b2

File tree

3 files changed

+20
-29
lines changed

3 files changed

+20
-29
lines changed

‎mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ galera_var_notify_cmd : MDEV-21488,MDEV-20600
4848
galera_var_reject_queries : assertion in inline_mysql_socket_send
4949
galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit
5050
galera_wan : MDEV-17259 Test failure on galera.galera_wan
51-
galera_wan_restart_sst : MDEV-21514 galera.galera_wan_restart_sst
5251
galera_wsrep_new_cluster : MDEV-21515 galera.galera_wsrep_new_cluster
5352
mysql-wsrep#198 : MDEV-18935 Galera test mysql-wsrep#198 sporaric assertion transaction.cpp:362: int wsrep::transaction::before_commit(): Assertion `state() == s_executing || state() == s_committing || state() == s_must_abort || state() == s_replaying' failed.
5453
mysql-wsrep#33 : MDEV-21420 galera.mysql-wsrep#33

‎mysql-test/suite/galera/r/galera_wan_restart_sst.result

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,40 @@ INSERT INTO t1 VALUES (33);
4848
connection node_4;
4949
INSERT INTO t1 VALUES (341);
5050
connection node_1;
51-
SELECT COUNT(*) = 19 FROM t1;
52-
COUNT(*) = 19
53-
1
51+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
52+
EXPECT_19
53+
19
5454
connection node_2;
5555
SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
5656
VARIABLE_VALUE = 4
5757
1
58-
SELECT COUNT(*) = 19 FROM t1;
59-
COUNT(*) = 19
60-
1
58+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
59+
EXPECT_19
60+
19
6161
connection node_3;
6262
SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
6363
VARIABLE_VALUE = 4
6464
1
65-
SELECT COUNT(*) = 19 FROM t1;
66-
COUNT(*) = 19
67-
1
65+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
66+
EXPECT_19
67+
19
6868
connection node_4;
6969
SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
7070
VARIABLE_VALUE = 4
7171
1
72-
SELECT COUNT(*) = 19 FROM t1;
73-
COUNT(*) = 19
74-
1
72+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
73+
EXPECT_19
74+
19
7575
connection node_1;
7676
DROP TABLE t1;
7777
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
7878
CALL mtr.add_suppression("WSREP: gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)");
7979
connection node_2;
80+
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
8081
CALL mtr.add_suppression("Action message in non-primary configuration from member 0");
8182
connection node_3;
8283
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
8384
CALL mtr.add_suppression("Action message in non-primary configuration from member 0");
8485
connection node_4;
86+
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
8587
CALL mtr.add_suppression("Action message in non-primary configuration from member 0");

‎mysql-test/suite/galera/t/galera_wan_restart_sst.test

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ INSERT INTO t1 VALUES (4);
3737
INSERT INTO t1 VALUES (13);
3838

3939
--source include/kill_galera.inc
40-
--sleep 5
4140

4241
--connection node_1
43-
--source include/wait_until_connected_again.inc
4442
INSERT INTO t1 VALUES (11);
4543

4644
--connection node_2
@@ -51,8 +49,6 @@ INSERT INTO t1 VALUES (14);
5149

5250
--connection node_3
5351
--source include/start_mysqld.inc
54-
--sleep 5
55-
--source include/wait_until_connected_again.inc
5652

5753
INSERT INTO t1 VALUES (131);
5854

@@ -64,10 +60,8 @@ INSERT INTO t1 VALUES (131);
6460
INSERT INTO t1 VALUES (22);
6561

6662
--source include/kill_galera.inc
67-
--sleep 5
6863

6964
--connection node_1
70-
--source include/wait_until_connected_again.inc
7165
INSERT INTO t1 VALUES (21);
7266

7367
--connection node_3
@@ -78,8 +72,6 @@ INSERT INTO t1 VALUES (24);
7872

7973
--connection node_2
8074
--source include/start_mysqld.inc
81-
--sleep 5
82-
--source include/wait_until_connected_again.inc
8375

8476
INSERT INTO t1 VALUES (221);
8577

@@ -91,10 +83,8 @@ INSERT INTO t1 VALUES (221);
9183
INSERT INTO t1 VALUES (34);
9284

9385
--source include/kill_galera.inc
94-
--sleep 5
9586

9687
--connection node_1
97-
--source include/wait_until_connected_again.inc
9888
INSERT INTO t1 VALUES (31);
9989

10090
--connection node_2
@@ -105,8 +95,6 @@ INSERT INTO t1 VALUES (33);
10595

10696
--connection node_4
10797
--source include/start_mysqld.inc
108-
--sleep 5
109-
--source include/wait_until_connected_again.inc
11098

11199
INSERT INTO t1 VALUES (341);
112100

@@ -119,31 +107,33 @@ INSERT INTO t1 VALUES (341);
119107
--let $wait_condition = SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
120108
--source include/wait_condition.inc
121109

122-
SELECT COUNT(*) = 19 FROM t1;
110+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
123111

124112
--connection node_2
125113
SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
126-
SELECT COUNT(*) = 19 FROM t1;
114+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
127115

128116
--connection node_3
129117
SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
130-
SELECT COUNT(*) = 19 FROM t1;
118+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
131119

132120
--connection node_4
133121
SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
134-
SELECT COUNT(*) = 19 FROM t1;
122+
SELECT COUNT(*) AS EXPECT_19 FROM t1;
135123

136124
--connection node_1
137125
DROP TABLE t1;
138126
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
139127
CALL mtr.add_suppression("WSREP: gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)");
140128

141129
--connection node_2
130+
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
142131
CALL mtr.add_suppression("Action message in non-primary configuration from member 0");
143132

144133
--connection node_3
145134
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
146135
CALL mtr.add_suppression("Action message in non-primary configuration from member 0");
147136

148137
--connection node_4
138+
CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
149139
CALL mtr.add_suppression("Action message in non-primary configuration from member 0");

0 commit comments

Comments
 (0)