mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
95fdeb89c2
The bug case is similar to one fixed earlier bug_49536.
Deadlock involving LOCK_log appears to be possible because the purge running thread
is holding LOCK_log whereas there is no sense of doing that and which fact was
exploited by the earlier bug fixes.
Fixed with small reengineering of rotate_and_purge(), adding two new methods and
setting up a policy to execute those instead of the former
rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED).
The policy for using rotate(), purge() is that if the caller acquires LOCK_log itself,
it should call rotate(), release the mutex and run purge().
Side effect of this patch is refining error message of bug@11747416 to print
the whole path.
mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result:
the file name printing is changed to a relative path instead of just the file name.
mysql-test/suite/rpl/r/rpl_log_pos.result:
the file name printing is changed to a relative path instead of just the file name.
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result:
the file name printing is changed to a relative path instead of just the file name.
mysql-test/suite/rpl/r/rpl_packet.result:
the file name printing is changed to a relative path instead of just the file name.
mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result:
new result file is added.
mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test:
The test of that bug can't satisfy windows and unix backslash interpretation so windows
execution is chosen to bypass.
mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt:
new opt file is added.
mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test:
regression test is added as well as verification of a
possible side effect of the fixes is tried.
sql/log.cc:
LOCK_log is never taken during execution of log purging routine.
The former MYSQL_BIN_LOG::rotate_and_purge is made to necessarily
acquiring and releasing LOCK_log.
If caller takes the mutex itself it has to use a new rotate(), purge()
methods combination and to never let purge() be run with LOCK_log grabbed.
split apart to allow
the caller to chose either it
Simulation of concurrently rotating/purging threads is added.
sql/log.h:
new rotate(), purge() methods are added to be used instead of
the former rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED).
rotate_and_purge() signature is changed. Caller should not call rotate_and_purge()
but rather {rotate(), purge()} if LOCK_log is acquired by it.
sql/rpl_injector.cc:
changes to reflect the new rotate_and_purge() signature.
sql/sql_class.h:
unnecessary constants are removed.
sql/sql_parse.cc:
changes to reflect the new rotate_and_purge() signature.
sql/sql_reload.cc:
changes to reflect the new rotate_and_purge() signature.
sql/sql_repl.cc:
followup for bug@11747416: the file name printing is changed to a relative
path instead of just the file name.
92 lines
2.6 KiB
Text
92 lines
2.6 KiB
Text
#
|
|
# Bug#11763573 - 56299: MUTEX DEADLOCK WITH COM_BINLOG_DUMP, BINLOG PURGE, AND PROCESSLIST/KILL
|
|
#
|
|
source include/master-slave.inc;
|
|
source include/have_debug_sync.inc;
|
|
source include/have_binlog_format_row.inc;
|
|
source include/have_innodb.inc;
|
|
|
|
#
|
|
# Testing that execution of two concurrent INSERTing connections both
|
|
# triggering the binlog rotation is correct even though their execution
|
|
# is interleaved.
|
|
# The test makes the first connection to complete the rotation part
|
|
# and yields control to the second connection that rotates as well and
|
|
# gets first on purging. And the fact of interleaving does not create
|
|
# any issue.
|
|
#
|
|
|
|
connection master;
|
|
source include/show_binary_logs.inc;
|
|
create table t1 (f text) engine=innodb;
|
|
SET DEBUG_SYNC = 'at_purge_logs_before_date WAIT_FOR rotated';
|
|
send insert into t1 set f=repeat('a', 4096);
|
|
|
|
connection master1;
|
|
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
|
|
WHERE STATE like "debug sync point: at_purge_logs_before_date%";
|
|
--source include/wait_condition.inc
|
|
|
|
--echo *** there must be two logs in the list ***
|
|
source include/show_binary_logs.inc;
|
|
|
|
insert into t1 set f=repeat('b', 4096);
|
|
|
|
--echo *** there must be three logs in the list ***
|
|
source include/show_binary_logs.inc;
|
|
|
|
SET DEBUG_SYNC = 'now SIGNAL rotated';
|
|
SET DEBUG_SYNC = 'RESET';
|
|
|
|
# the first connection finally completes its INSERT
|
|
connection master;
|
|
reap;
|
|
SET DEBUG_SYNC = 'RESET';
|
|
|
|
sync_slave_with_master;
|
|
|
|
|
|
#
|
|
# Testing the reported deadlock involving DUMP, KILL and INSERT threads
|
|
#
|
|
|
|
connection master;
|
|
SET DEBUG_SYNC = 'at_purge_logs_before_date WAIT_FOR rotated';
|
|
send insert into t1 set f=repeat('b', 4096);
|
|
|
|
connection master1;
|
|
|
|
# make sure INSERT reaches waiting point
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
|
|
WHERE STATE like "debug sync point: at_purge_logs_before_date%";
|
|
--source include/wait_condition.inc
|
|
|
|
# find and kill DUMP thread
|
|
let $_tid= `select id from information_schema.processlist where command = 'Binlog Dump' limit 1`;
|
|
--disable_query_log
|
|
eval kill query $_tid;
|
|
--enable_query_log
|
|
|
|
#
|
|
# Now the proof is that the new DUMP thread has executed
|
|
# a critical section of the deadlock without any regression and is UP
|
|
#
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
|
|
WHERE command = 'Binlog Dump' and STATE like "Master has sent all binlog to slave%";
|
|
--source include/wait_condition.inc
|
|
|
|
SET DEBUG_SYNC = 'now SIGNAL rotated';
|
|
SET DEBUG_SYNC = 'RESET';
|
|
|
|
connection master;
|
|
reap;
|
|
SET DEBUG_SYNC = 'RESET';
|
|
drop table t1;
|
|
|
|
sync_slave_with_master;
|
|
|
|
--source include/rpl_end.inc
|