Skip to content

Commit 5fdafcc

Browse files
abhinav04sharmafacebook-github-bot
abhinav04sharma
authored and
facebook-github-bot
committed
Fixing rpl_raft_wait_for_ack
Summary: There was a change in debug syncs on the plugin side. Reviewed By: yichenshen Differential Revision: D45130505 fbshipit-source-id: 8e242e5
1 parent 8a94981 commit 5fdafcc

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

‎mysql-test/suite/rpl_raft/r/rpl_raft_wait_for_ack.result‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ include/sync_slave_sql_with_master.inc
5959
select @@global.raft_signal_async_dump_threads;
6060
@@global.raft_signal_async_dump_threads
6161
AFTER_CONSENSUS
62-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
62+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
6363
insert into t1 values(1);
64-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
64+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
6565
include/sync_slave_sql_with_master.inc
6666
include/sync_slave_sql_with_master.inc
6767
select * from t1;
@@ -75,7 +75,7 @@ a
7575
select * from t1;
7676
a
7777
1
78-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
78+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
7979
set @@global.rpl_raft_debug_sync_point = '';
8080
include/sync_slave_sql_with_master.inc
8181
include/sync_slave_sql_with_master.inc
@@ -95,9 +95,9 @@ a
9595
select @@global.raft_signal_async_dump_threads;
9696
@@global.raft_signal_async_dump_threads
9797
AFTER_CONSENSUS
98-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
98+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
9999
insert into t1 values(2);
100-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
100+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
101101
include/sync_slave_sql_with_master.inc
102102
select * from t1;
103103
a
@@ -113,7 +113,7 @@ a
113113
select * from t1;
114114
a
115115
1
116-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
116+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
117117
set @@global.rpl_raft_debug_sync_point = '';
118118
include/sync_slave_sql_with_master.inc
119119
include/sync_slave_sql_with_master.inc
@@ -137,9 +137,9 @@ a
137137
2
138138
"Case 3: Test AFTER_ENGINE_COMMIT on leader"
139139
set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
140-
set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
140+
set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
141141
insert into t1 values(3);
142-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
142+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
143143
include/sync_slave_sql_with_master.inc
144144
include/sync_slave_sql_with_master.inc
145145
select * from t1;
@@ -161,7 +161,7 @@ a
161161
1
162162
2
163163
3
164-
set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
164+
set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
165165
set @@global.rpl_raft_debug_sync_point = '';
166166
include/sync_slave_sql_with_master.inc
167167
include/sync_slave_sql_with_master.inc
@@ -188,9 +188,9 @@ a
188188
set @@global.raft_signal_async_dump_threads = AFTER_CONSENSUS;
189189
"Case 4: Test AFTER_ENGINE_COMMIT on follower"
190190
set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
191-
set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
191+
set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
192192
insert into t1 values(4);
193-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
193+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
194194
include/sync_slave_sql_with_master.inc
195195
select * from t1;
196196
a
@@ -215,7 +215,7 @@ a
215215
1
216216
2
217217
3
218-
set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
218+
set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
219219
set @@global.rpl_raft_debug_sync_point = '';
220220
include/sync_slave_sql_with_master.inc
221221
include/sync_slave_sql_with_master.inc
@@ -248,9 +248,9 @@ a
248248
set @@global.raft_signal_async_dump_threads = AFTER_CONSENSUS;
249249
"Case 5: Check if rotation is handled correctly on leader"
250250
flush binary logs;
251-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
251+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
252252
insert into t1 values(5);
253-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
253+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
254254
include/sync_slave_sql_with_master.inc
255255
include/sync_slave_sql_with_master.inc
256256
include/sync_slave_sql_with_master.inc
@@ -281,7 +281,7 @@ a
281281
3
282282
4
283283
5
284-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
284+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
285285
set @@global.rpl_raft_debug_sync_point = '';
286286
include/sync_slave_sql_with_master.inc
287287
include/sync_slave_sql_with_master.inc
@@ -317,9 +317,9 @@ a
317317
5
318318
"Case 6: Check if rotation is handled correctly on follower"
319319
flush binary logs;
320-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
320+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
321321
insert into t1 values(6);
322-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
322+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
323323
include/sync_slave_sql_with_master.inc
324324
include/sync_slave_sql_with_master.inc
325325
select * from t1;
@@ -352,7 +352,7 @@ a
352352
3
353353
4
354354
5
355-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
355+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
356356
set @@global.rpl_raft_debug_sync_point = '';
357357
include/sync_slave_sql_with_master.inc
358358
include/sync_slave_sql_with_master.inc

‎mysql-test/suite/rpl_raft/t/rpl_raft_wait_for_ack.test‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ echo "Case 1: Test AFTER_CONSENSUS on leader";
5050
connection server_1;
5151
# Should be AFTER_CONSENSUS
5252
select @@global.raft_signal_async_dump_threads;
53-
# Wait before executing replicationDone i.e. before commit hook
54-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
53+
# Wait before executing ReplicationDoneCallback i.e. before commit hook
54+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
5555

5656
# Execute a trx on the leader
5757
connection server_1_1;
5858
send insert into t1 values(1);
5959

60-
# Wait till we've reached the beginning of replicationDone
60+
# Wait till we've reached the beginning of ReplicationDoneCallback
6161
connection server_1;
62-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
62+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
6363

6464
# Sync both raft nodes
6565
let $sync_slave_connection= server_2;
@@ -80,9 +80,9 @@ select * from t1;
8080
connection server_5;
8181
select * from t1;
8282

83-
# Continue replicationDone
83+
# Continue ReplicationDoneCallback
8484
connection server_1;
85-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
85+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
8686
set @@global.rpl_raft_debug_sync_point = '';
8787

8888
connection server_1_1;
@@ -113,16 +113,16 @@ echo "Case 2: Test AFTER_CONSENSUS on follower";
113113
connection server_2;
114114
# Should be AFTER_CONSENSUS
115115
select @@global.raft_signal_async_dump_threads;
116-
# Wait before executing replicationDone
117-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
116+
# Wait before executing ReplicationDoneCallback
117+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
118118

119119
# Execute a trx on the leader
120120
connection server_1;
121121
insert into t1 values(2);
122122

123-
# Wait till we've reached the beginning of replicationDone
123+
# Wait till we've reached the beginning of ReplicationDoneCallback
124124
connection server_2;
125-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
125+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
126126

127127
# Sync server3
128128
let $sync_slave_connection= server_3;
@@ -141,9 +141,9 @@ select * from t1;
141141
connection server_5;
142142
select * from t1;
143143

144-
# Continue replicationDone
144+
# Continue ReplicationDoneCallback
145145
connection server_2;
146-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
146+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
147147
set @@global.rpl_raft_debug_sync_point = '';
148148

149149
connection server_1;
@@ -173,16 +173,16 @@ echo "Case 3: Test AFTER_ENGINE_COMMIT on leader";
173173

174174
connection server_1;
175175
set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
176-
# Wait before executing updateConsensusApplied i.e. after commit
177-
set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
176+
# Wait before executing UpdateConsensusApplied i.e. after commit
177+
set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
178178

179179
# Execute a trx on the leader
180180
connection server_1_1;
181181
send insert into t1 values(3);
182182

183-
# Wait till we've reached the beginning of replicationDone
183+
# Wait till we've reached the beginning of ReplicationDoneCallback
184184
connection server_1;
185-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
185+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
186186

187187
# Sync both raft nodes
188188
let $sync_slave_connection= server_2;
@@ -203,9 +203,9 @@ select * from t1;
203203
connection server_5;
204204
select * from t1;
205205

206-
# Continue replicationDone
206+
# Continue ReplicationDoneCallback
207207
connection server_1;
208-
set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
208+
set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
209209
set @@global.rpl_raft_debug_sync_point = '';
210210

211211
connection server_1_1;
@@ -236,16 +236,16 @@ echo "Case 4: Test AFTER_ENGINE_COMMIT on follower";
236236

237237
connection server_2;
238238
set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
239-
# Wait before executing updateConsensusApplied
240-
set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
239+
# Wait before executing UpdateConsensusApplied
240+
set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
241241

242242
# Execute a trx on the leader
243243
connection server_1;
244244
insert into t1 values(4);
245245

246-
# Wait till we've reached the beginning of replicationDone
246+
# Wait till we've reached the beginning of ReplicationDoneCallback
247247
connection server_2;
248-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
248+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
249249

250250
# Sync server3
251251
let $sync_slave_connection= server_3;
@@ -264,9 +264,9 @@ select * from t1;
264264
connection server_5;
265265
select * from t1;
266266

267-
# Continue replicationDone
267+
# Continue ReplicationDoneCallback
268268
connection server_2;
269-
set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
269+
set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
270270
set @@global.rpl_raft_debug_sync_point = '';
271271

272272
connection server_1;
@@ -300,16 +300,16 @@ echo "Case 5: Check if rotation is handled correctly on leader";
300300
connection server_1;
301301
# Rotate raft log
302302
flush binary logs;
303-
# Wait before executing replicationDone i.e. before commit hook
304-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
303+
# Wait before executing ReplicationDoneCallback i.e. before commit hook
304+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
305305

306306
# Execute a trx on the leader
307307
connection server_1_1;
308308
send insert into t1 values(5);
309309

310-
# Wait till we've reached the beginning of replicationDone
310+
# Wait till we've reached the beginning of ReplicationDoneCallback
311311
connection server_1;
312-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
312+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
313313

314314
let $sync_slave_connection= server_2;
315315
source include/sync_slave_sql_with_master.inc;
@@ -337,9 +337,9 @@ select * from t1;
337337
connection server_5;
338338
select * from t1;
339339

340-
# Continue replicationDone
340+
# Continue ReplicationDoneCallback
341341
connection server_1;
342-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
342+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
343343
set @@global.rpl_raft_debug_sync_point = '';
344344

345345
connection server_1_1;
@@ -374,16 +374,16 @@ connection server_1;
374374
# Rotate raft logs
375375
flush binary logs;
376376
connection server_2;
377-
# Wait before executing replicationDone
378-
set @@global.rpl_raft_debug_sync_point = 'replicationDone';
377+
# Wait before executing ReplicationDoneCallback
378+
set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
379379

380380
# Execute a trx on the leader
381381
connection server_1;
382382
insert into t1 values(6);
383383

384-
# Wait till we've reached the beginning of replicationDone
384+
# Wait till we've reached the beginning of ReplicationDoneCallback
385385
connection server_2;
386-
set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
386+
set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
387387

388388
let $sync_slave_connection= server_3;
389389
source include/sync_slave_sql_with_master.inc;
@@ -409,9 +409,9 @@ select * from t1;
409409
connection server_5;
410410
select * from t1;
411411

412-
# Continue replicationDone
412+
# Continue ReplicationDoneCallback
413413
connection server_2;
414-
set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
414+
set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
415415
set @@global.rpl_raft_debug_sync_point = '';
416416

417417
# Sync all servers

0 commit comments

Comments
 (0)