database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for timeout in rpl.rpl_parallel_retry

Browse Source 
MDEV-17109 rpl.rpl_parallel_retry fails in buildbot with timeout

I was not able to prove that this fix works, but at least it simplifies
the problem as it removes some possible timing issues.
This commit is contained in:
Monty
2020-09-15 16:13:37 +03:00
parent 16ea692ed4
commit 895e9950b2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_parallel_retry.result
View File

@ -372,7 +372,7 @@ connection server_2;
SET @old_dbug= @@GLOBAL.debug_dbug; SET @old_dbug= @@GLOBAL.debug_dbug;
SET @@GLOBAL.debug_dbug="+d,rpl_parallel_simulate_wait_at_retry"; SET @@GLOBAL.debug_dbug="+d,rpl_parallel_simulate_wait_at_retry";
include/start_slave.inc include/start_slave.inc
# Make sure the 2nd seqno_1001 worker has gotten to waiting # Make sure both workers are waiting at their sync points
# Signal to the 1st to proceed after it has reached termination state # Signal to the 1st to proceed after it has reached termination state
SET @@DEBUG_SYNC='now SIGNAL proceed_by_1000'; SET @@DEBUG_SYNC='now SIGNAL proceed_by_1000';
connection spoiler_21; connection spoiler_21;

4
mysql-test/suite/rpl/t/rpl_parallel_retry.test
View File

@ -426,8 +426,8 @@ SET @old_dbug= @@GLOBAL.debug_dbug;
SET @@GLOBAL.debug_dbug="+d,rpl_parallel_simulate_wait_at_retry"; SET @@GLOBAL.debug_dbug="+d,rpl_parallel_simulate_wait_at_retry";
--source include/start_slave.inc --source include/start_slave.inc
--echo # Make sure the 2nd seqno_1001 worker has gotten to waiting --echo # Make sure both workers are waiting at their sync points
--let $wait_condition= SELECT count(*) FROM information_schema.processlist WHERE state LIKE '%debug sync point: now%'; --let $wait_condition= SELECT count(*)=2 FROM information_schema.processlist WHERE state LIKE '%debug sync point%';
--source include/wait_condition.inc --source include/wait_condition.inc