Commit 545d740c authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix race condition in rpl_stop_start_slave. after kill connection, wait until...

Fix race condition in rpl_stop_start_slave. after kill connection, wait until it is gone in processlist
parent 49d6568a
...@@ -28,7 +28,8 @@ set @time_before_kill := (select CURRENT_TIMESTAMP); ...@@ -28,7 +28,8 @@ set @time_before_kill := (select CURRENT_TIMESTAMP);
--replace_regex /kill [0-9]*/kill <connection_id>/ --replace_regex /kill [0-9]*/kill <connection_id>/
--eval kill $connection_id --eval kill $connection_id
let $wait_condition= SELECT COUNT(*) = 0 FROM information_schema.processlist where id=$connection_id;
--source include/wait_condition.inc
set @time_after_kill := (select CURRENT_TIMESTAMP); set @time_after_kill := (select CURRENT_TIMESTAMP);
--echo [Time after the query] --echo [Time after the query]
...@@ -38,10 +39,9 @@ if(`select TIMESTAMPDIFF(SECOND,@time_after_kill, @time_before_kill) > 60`) ...@@ -38,10 +39,9 @@ if(`select TIMESTAMPDIFF(SECOND,@time_after_kill, @time_before_kill) > 60`)
--echo # assert : The difference between the timestamps 'time_after_kill' and 'time_before_kill' should be less than 60sec. --echo # assert : The difference between the timestamps 'time_after_kill' and 'time_before_kill' should be less than 60sec.
--die --die
} }
--echo [Killing of the slave IO thread was successful] --echo [Killing of the slave IO thread was successful]
--disable_warnings
START SLAVE IO_THREAD; START SLAVE IO_THREAD;
--enable_warnings
# End of test # End of test
--source include/rpl_end.inc --source include/rpl_end.inc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment