Skip to content

Commit fe4f766

Browse files
author
Jan Lindström
committed
Add wait_condition to wait that node returns to ready state before
accessing it.
1 parent 5709a77 commit fe4f766

File tree

2 files changed

+67
-54
lines changed

2 files changed

+67
-54
lines changed

mysql-test/suite/galera/r/galera_var_ignore_apply_errors.result

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ INSERT INTO t1 VALUES (1);
3838
SET GLOBAL wsrep_on = ON;
3939
DELETE FROM t1 WHERE f1 = 1;
4040
connection node_1;
41-
SELECT COUNT(*) = 0 FROM t1;
42-
COUNT(*) = 0
43-
1
41+
SELECT COUNT(*) as expect_0 FROM t1;
42+
expect_0
43+
0
4444
connection node_2;
45-
SELECT COUNT(*) = 0 FROM t1;
46-
COUNT(*) = 0
47-
1
45+
SELECT COUNT(*) as expect_0 FROM t1;
46+
expect_0
47+
0
4848
DROP TABLE t1;
4949
connection node_1;
5050
CREATE TABLE t1 (f1 INTEGER);
@@ -58,12 +58,12 @@ DELETE FROM t1 WHERE f1 = 1;
5858
DELETE FROM t1 WHERE f1 = 2;
5959
COMMIT;
6060
connection node_1;
61-
SELECT COUNT(*) = 1 FROM t1;
62-
COUNT(*) = 1
61+
SELECT COUNT(*) as expect_1 FROM t1;
62+
expect_1
6363
1
6464
connection node_2;
65-
SELECT COUNT(*) = 1 FROM t1;
66-
COUNT(*) = 1
65+
SELECT COUNT(*) as expect_1 FROM t1;
66+
expect_1
6767
1
6868
DROP TABLE t1;
6969
connection node_1;
@@ -75,16 +75,16 @@ DELETE FROM t1 WHERE f1 = 3;
7575
SET SESSION wsrep_on = ON;
7676
connection node_1;
7777
DELETE FROM t1;
78-
SELECT COUNT(*) = 0 FROM t1;
79-
COUNT(*) = 0
80-
1
78+
SELECT COUNT(*) as expect_0 FROM t1;
79+
expect_0
80+
0
8181
connection node_2;
8282
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
8383
VARIABLE_VALUE = 'Primary'
8484
1
85-
SELECT COUNT(*) = 0 FROM t1;
86-
COUNT(*) = 0
87-
1
85+
SELECT COUNT(*) as expect_0 FROM t1;
86+
expect_0
87+
0
8888
DROP TABLE t1;
8989
connection node_1;
9090
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
@@ -103,16 +103,16 @@ DELETE FROM t1 WHERE f1 = 4;
103103
DELETE FROM t1 WHERE f1 = 5;
104104
COMMIT;
105105
SET AUTOCOMMIT=ON;
106-
SELECT COUNT(*) = 0 FROM t1;
107-
COUNT(*) = 0
108-
1
106+
SELECT COUNT(*) as expect_0 FROM t1;
107+
expect_0
108+
0
109109
connection node_2;
110110
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
111111
VARIABLE_VALUE = 'Primary'
112112
1
113-
SELECT COUNT(*) = 0 FROM t1;
114-
COUNT(*) = 0
115-
1
113+
SELECT COUNT(*) as expect_0 FROM t1;
114+
expect_0
115+
0
116116
DROP TABLE t1;
117117
connection node_1;
118118
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
@@ -126,16 +126,16 @@ DELETE FROM t1 WHERE f1 = 3;
126126
SET SESSION wsrep_on = ON;
127127
connection node_1;
128128
DELETE t1, t2 FROM t1 JOIN t2 WHERE t1.f1 = t2.f1;
129-
SELECT COUNT(*) = 0 FROM t1;
130-
COUNT(*) = 0
131-
1
129+
SELECT COUNT(*) as expect_0 FROM t1;
130+
expect_0
131+
0
132132
connection node_2;
133133
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
134134
VARIABLE_VALUE = 'Primary'
135135
1
136-
SELECT COUNT(*) = 0 FROM t1;
137-
COUNT(*) = 0
138-
1
136+
SELECT COUNT(*) as expect_0 FROM t1;
137+
expect_0
138+
0
139139
DROP TABLE t1,t2;
140140
connection node_1;
141141
CREATE TABLE parent (id INT NOT NULL, PRIMARY KEY (id)) ENGINE=INNODB;
@@ -148,22 +148,22 @@ DELETE FROM child WHERE parent_id = 2;
148148
SET SESSION wsrep_on = ON;
149149
connection node_1;
150150
DELETE FROM parent;
151-
SELECT COUNT(*) = 0 FROM parent;
152-
COUNT(*) = 0
153-
1
154-
SELECT COUNT(*) = 0 FROM child;
155-
COUNT(*) = 0
156-
1
151+
SELECT COUNT(*) as expect_0 FROM parent;
152+
expect_0
153+
0
154+
SELECT COUNT(*) as expect_0 FROM child;
155+
expect_0
156+
0
157157
connection node_2;
158158
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
159159
VARIABLE_VALUE = 'Primary'
160160
1
161-
SELECT COUNT(*) = 0 FROM parent;
162-
COUNT(*) = 0
163-
1
164-
SELECT COUNT(*) = 0 FROM child;
165-
COUNT(*) = 0
166-
1
161+
SELECT COUNT(*) as expect_0 FROM parent;
162+
expect_0
163+
0
164+
SELECT COUNT(*) as expect_0 FROM child;
165+
expect_0
166+
0
167167
DROP TABLE child, parent;
168168
connection node_2;
169169
SET GLOBAL wsrep_ignore_apply_errors = 4;

mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@ SET GLOBAL wsrep_ignore_apply_errors = 1;
1818
SET GLOBAL wsrep_on = OFF;
1919
CREATE TABLE t1 (f1 INTEGER);
2020
SET GLOBAL wsrep_on = ON;
21+
--source include/galera_wait_ready.inc
2122
DROP TABLE t1;
2223

2324
# Drop schema that does not exist
2425
SET GLOBAL wsrep_on = OFF;
2526
CREATE SCHEMA s1;
2627
SET GLOBAL wsrep_on = ON;
28+
--source include/galera_wait_ready.inc
2729
DROP SCHEMA s1;
2830

2931
# Drop index that does not exist using DROP INDEX
3032
CREATE TABLE t1 (f1 INTEGER);
3133
SET GLOBAL wsrep_on = OFF;
3234
CREATE INDEX idx1 ON t1 (f1);
3335
SET GLOBAL wsrep_on = ON;
36+
--source include/galera_wait_ready.inc
3437
DROP INDEX idx1 ON t1;
3538
DROP TABLE t1;
3639

@@ -39,6 +42,7 @@ CREATE TABLE t1 (f1 INTEGER);
3942
SET GLOBAL wsrep_on = OFF;
4043
CREATE INDEX idx1 ON t1 (f1);
4144
SET GLOBAL wsrep_on = ON;
45+
--source include/galera_wait_ready.inc
4246
ALTER TABLE t1 DROP INDEX idx1;
4347
DROP TABLE t1;
4448

@@ -47,6 +51,7 @@ CREATE TABLE t1 (f1 INTEGER);
4751
SET GLOBAL wsrep_on = OFF;
4852
ALTER TABLE t1 ADD COLUMN f2 INTEGER;
4953
SET GLOBAL wsrep_on = ON;
54+
--source include/galera_wait_ready.inc
5055
ALTER TABLE t1 DROP COLUMN f2;
5156
DROP TABLE t1;
5257

@@ -64,12 +69,13 @@ CREATE TABLE t1 (f1 INTEGER);
6469
SET GLOBAL wsrep_on = OFF;
6570
INSERT INTO t1 VALUES (1);
6671
SET GLOBAL wsrep_on = ON;
72+
--source include/galera_wait_ready.inc
6773
DELETE FROM t1 WHERE f1 = 1;
6874

6975
--connection node_1
70-
SELECT COUNT(*) = 0 FROM t1;
76+
SELECT COUNT(*) as expect_0 FROM t1;
7177
--connection node_2
72-
SELECT COUNT(*) = 0 FROM t1;
78+
SELECT COUNT(*) as expect_0 FROM t1;
7379

7480
DROP TABLE t1;
7581

@@ -80,16 +86,17 @@ INSERT INTO t1 VALUES (2);
8086
SET GLOBAL wsrep_on = OFF;
8187
INSERT INTO t1 VALUES (1);
8288
SET GLOBAL wsrep_on = ON;
89+
--source include/galera_wait_ready.inc
8390
START TRANSACTION;
8491
INSERT INTO t1 VALUES (3);
8592
DELETE FROM t1 WHERE f1 = 1;
8693
DELETE FROM t1 WHERE f1 = 2;
8794
COMMIT;
8895

8996
--connection node_1
90-
SELECT COUNT(*) = 1 FROM t1;
97+
SELECT COUNT(*) as expect_1 FROM t1;
9198
--connection node_2
92-
SELECT COUNT(*) = 1 FROM t1;
99+
SELECT COUNT(*) as expect_1 FROM t1;
93100

94101
DROP TABLE t1;
95102

@@ -107,13 +114,14 @@ INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
107114
SET SESSION wsrep_on = OFF;
108115
DELETE FROM t1 WHERE f1 = 3;
109116
SET SESSION wsrep_on = ON;
117+
--source include/galera_wait_ready.inc
110118
--connection node_1
111119
DELETE FROM t1;
112120

113-
SELECT COUNT(*) = 0 FROM t1;
121+
SELECT COUNT(*) as expect_0 FROM t1;
114122
--connection node_2
115123
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
116-
SELECT COUNT(*) = 0 FROM t1;
124+
SELECT COUNT(*) as expect_0 FROM t1;
117125
DROP TABLE t1;
118126

119127
#
@@ -130,6 +138,8 @@ INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
130138
SET SESSION wsrep_on = OFF;
131139
DELETE FROM t1 WHERE f1 = 3;
132140
SET SESSION wsrep_on = ON;
141+
--source include/galera_wait_ready.inc
142+
133143
--connection node_1
134144

135145
SET AUTOCOMMIT=OFF;
@@ -142,10 +152,10 @@ DELETE FROM t1 WHERE f1 = 5;
142152
COMMIT;
143153
SET AUTOCOMMIT=ON;
144154

145-
SELECT COUNT(*) = 0 FROM t1;
155+
SELECT COUNT(*) as expect_0 FROM t1;
146156
--connection node_2
147157
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
148-
SELECT COUNT(*) = 0 FROM t1;
158+
SELECT COUNT(*) as expect_0 FROM t1;
149159
DROP TABLE t1;
150160

151161
#
@@ -166,14 +176,15 @@ SET SESSION wsrep_on = OFF;
166176
DELETE FROM t2 WHERE f1 = 2;
167177
DELETE FROM t1 WHERE f1 = 3;
168178
SET SESSION wsrep_on = ON;
179+
--source include/galera_wait_ready.inc
169180

170181
--connection node_1
171182
DELETE t1, t2 FROM t1 JOIN t2 WHERE t1.f1 = t2.f1;
172-
SELECT COUNT(*) = 0 FROM t1;
183+
SELECT COUNT(*) as expect_0 FROM t1;
173184

174185
--connection node_2
175186
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
176-
SELECT COUNT(*) = 0 FROM t1;
187+
SELECT COUNT(*) as expect_0 FROM t1;
177188
DROP TABLE t1,t2;
178189

179190
#
@@ -193,16 +204,17 @@ INSERT INTO child VALUES (1,1),(2,2),(3,3);
193204
SET SESSION wsrep_on = OFF;
194205
DELETE FROM child WHERE parent_id = 2;
195206
SET SESSION wsrep_on = ON;
207+
--source include/galera_wait_ready.inc
196208

197209
--connection node_1
198210
DELETE FROM parent;
199-
SELECT COUNT(*) = 0 FROM parent;
200-
SELECT COUNT(*) = 0 FROM child;
211+
SELECT COUNT(*) as expect_0 FROM parent;
212+
SELECT COUNT(*) as expect_0 FROM child;
201213

202214
--connection node_2
203215
SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
204-
SELECT COUNT(*) = 0 FROM parent;
205-
SELECT COUNT(*) = 0 FROM child;
216+
SELECT COUNT(*) as expect_0 FROM parent;
217+
SELECT COUNT(*) as expect_0 FROM child;
206218
DROP TABLE child, parent;
207219

208220
#
@@ -217,6 +229,7 @@ SET GLOBAL wsrep_ignore_apply_errors = 4;
217229
SET GLOBAL wsrep_on = OFF;
218230
CREATE TABLE t1 (f1 INTEGER);
219231
SET GLOBAL wsrep_on = ON;
232+
--source include/galera_wait_ready.inc
220233
--connection node_1
221234
CREATE TABLE t1 (f1 INTEGER, f2 INTEGER);
222235
DROP TABLE t1;

0 commit comments

Comments
 (0)