Skip to content

Commit

Permalink
MDEV-32168: slave_error_param condition is never checked from the wai…
Browse files Browse the repository at this point in the history
…t_for_slave_param.inc

Fix wrong change to rpl.rpl_shutdown_wait_slaves. After shutting down the
master, slaves may or may not succeed in reconnecting depending on the timing
on their reconnect relative to master restart. So don't assume all IO threads
will be running, just restart any slave that needs it.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
  • Loading branch information
knielsen committed Nov 17, 2023
1 parent 7e394d0 commit 0258ad5
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
4 changes: 0 additions & 4 deletions mysql-test/suite/rpl/include/rpl_shutdown_wait_slaves.inc
Expand Up @@ -80,21 +80,17 @@ DROP TABLE t1;
--connection server_2
--disable_warnings
--let rpl_allow_error=1
--source include/wait_for_slave_io_to_start.inc

--source include/start_slave.inc
--enable_warnings

--connection server_3
--disable_warnings
--let rpl_allow_error=1
--source include/wait_for_slave_io_to_start.inc
--source include/start_slave.inc
--enable_warnings

--connection server_4
--disable_warnings
--let rpl_allow_error=1
--source include/wait_for_slave_io_to_start.inc
--source include/start_slave.inc
--enable_warnings
Expand Up @@ -34,13 +34,10 @@ connection server_1;
connection server_1;
DROP TABLE t1;
connection server_2;
include/wait_for_slave_io_to_start.inc
include/start_slave.inc
connection server_3;
include/wait_for_slave_io_to_start.inc
include/start_slave.inc
connection server_4;
include/wait_for_slave_io_to_start.inc
include/start_slave.inc
connection server_2;
include/stop_slave.inc
Expand Down
3 changes: 0 additions & 3 deletions mysql-test/suite/rpl/r/rpl_shutdown_wait_slaves.result
Expand Up @@ -21,12 +21,9 @@ connection server_1;
connection server_1;
DROP TABLE t1;
connection server_2;
include/wait_for_slave_io_to_start.inc
include/start_slave.inc
connection server_3;
include/wait_for_slave_io_to_start.inc
include/start_slave.inc
connection server_4;
include/wait_for_slave_io_to_start.inc
include/start_slave.inc
include/rpl_end.inc

0 comments on commit 0258ad5

Please sign in to comment.