mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
292f91e83d
thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop when it's waiting for relay log space. Reset ignore_log_space_limit to 0 when the SQL thread terminates. mysql-test/r/rpl_relayspace.result: result update mysql-test/t/rpl_relayspace-slave.opt: smaller relay_log_space_limit to speed up things. mysql-test/t/rpl_relayspace.test: Less queries in the test, to make it simpler. Testcase if the IO thread blocked in wait_for_relay_log_space accepts to stop when STOP SLAVE. sql/slave.cc: thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop when it's waiting on cond (waiting for relay log space). Reset ignore_log_space_limit to 0 when the SQL thread terminates.
32 lines
1 KiB
Text
32 lines
1 KiB
Text
# The slave is started with relay_log_space_limit=10 bytes,
|
|
# to force the deadlock after one event.
|
|
|
|
source include/master-slave.inc;
|
|
connection slave;
|
|
stop slave;
|
|
connection master;
|
|
# This will generate a master's binlog > 10 bytes
|
|
create table t1 (a int);
|
|
drop table t1;
|
|
create table t1 (a int);
|
|
drop table t1;
|
|
connection slave;
|
|
reset slave;
|
|
start slave io_thread;
|
|
# Give the I/O thread time to block.
|
|
sleep 2;
|
|
# A bug caused the I/O thread to refuse stopping.
|
|
stop slave io_thread;
|
|
reset slave;
|
|
start slave;
|
|
# The I/O thread stops filling the relay log when
|
|
# it's >10b. And the SQL thread cannot purge this relay log
|
|
# as purge is done only when the SQL thread switches to another
|
|
# relay log, which does not exist here.
|
|
# So we should have a deadlock.
|
|
# if it is not resolved automatically we'll detect
|
|
# it with master_pos_wait that waits for farther than 1Ob;
|
|
# it will timeout after 10 seconds;
|
|
# also the slave will probably not cooperate to shutdown
|
|
# (as 2 threads are locked)
|
|
select master_pos_wait('master-bin.001',200,6)=-1;
|