diff options
| author | Monty <monty@mariadb.org> | 2020-09-15 16:13:37 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-09-25 13:07:04 +0300 |
| commit | 895e9950b2a361a7cf428f60a32e7e3ddc49f833 (patch) | |
| tree | 038ac51d1fc552f32615d2eddb7542037a54bbbf /mysql-test/suite/rpl | |
| parent | 16ea692ed490a1a2c6dc0b855247d5bd02bd2345 (diff) | |
| download | mariadb-git-895e9950b2a361a7cf428f60a32e7e3ddc49f833.tar.gz | |
Fix for timeout in rpl.rpl_parallel_retry
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.
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_parallel_retry.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_parallel_retry.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_parallel_retry.result b/mysql-test/suite/rpl/r/rpl_parallel_retry.result index 66428c94086..b43556815d1 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_retry.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_retry.result @@ -372,7 +372,7 @@ connection server_2; SET @old_dbug= @@GLOBAL.debug_dbug; SET @@GLOBAL.debug_dbug="+d,rpl_parallel_simulate_wait_at_retry"; 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 SET @@DEBUG_SYNC='now SIGNAL proceed_by_1000'; connection spoiler_21; diff --git a/mysql-test/suite/rpl/t/rpl_parallel_retry.test b/mysql-test/suite/rpl/t/rpl_parallel_retry.test index 96863f9021d..55da54e3c8c 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_retry.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_retry.test @@ -426,8 +426,8 @@ SET @old_dbug= @@GLOBAL.debug_dbug; SET @@GLOBAL.debug_dbug="+d,rpl_parallel_simulate_wait_at_retry"; --source include/start_slave.inc ---echo # Make sure the 2nd seqno_1001 worker has gotten to waiting ---let $wait_condition= SELECT count(*) FROM information_schema.processlist WHERE state LIKE '%debug sync point: now%'; +--echo # Make sure both workers are waiting at their sync points +--let $wait_condition= SELECT count(*)=2 FROM information_schema.processlist WHERE state LIKE '%debug sync point%'; --source include/wait_condition.inc |