database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixed main.flush_read_lock sporadic failure

Browse Source 
With MDEV-19384 fixed FTWRL releases HANDLER locks early, which allows
concurrent threads to go. Test case may get stuck on FTWRL waiting for
LOCK TABLES.
This commit is contained in:
Sergey Vojtovich
2019-05-13 17:56:31 +04:00
parent 341c3379ae
commit 7a6c36b547
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/main/flush_read_lock.result
View File

@@ -1736,6 +1736,7 @@ SET DEBUG_SYNC= 'RESET';
# MDEV-19384 Deadlock between FTWRL under open HANDLER, LOCK TABLE # MDEV-19384 Deadlock between FTWRL under open HANDLER, LOCK TABLE
# and DROP DATABASE # and DROP DATABASE
# #
SET DEBUG_SYNC= 'ftwrl_before_lock SIGNAL ready WAIT_FOR go';
CREATE DATABASE mysqltest; CREATE DATABASE mysqltest;
CREATE TABLE mysqltest.t1(a INT); CREATE TABLE mysqltest.t1(a INT);
HANDLER mysqltest.t1 OPEN as t1; HANDLER mysqltest.t1 OPEN as t1;
@@ -1748,14 +1749,17 @@ SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready';
DROP DATABASE mysqltest; DROP DATABASE mysqltest;
connect con3,localhost,root,,; connect con3,localhost,root,,;
SET DEBUG_SYNC= 'now WAIT_FOR ready'; SET DEBUG_SYNC= 'now WAIT_FOR ready';
disconnect con3;
connection default; connection default;
FLUSH TABLES WITH READ LOCK; FLUSH TABLES WITH READ LOCK;
connection con3;
SET DEBUG_SYNC= 'now WAIT_FOR ready';
disconnect con3;
connection con1;
SET DEBUG_SYNC= 'now SIGNAL go';
disconnect con1;
connection default;
UNLOCK TABLES; UNLOCK TABLES;
HANDLER t1 CLOSE; HANDLER t1 CLOSE;
connection con1;
UNLOCK TABLES;
disconnect con1;
connection con2; connection con2;
disconnect con2; disconnect con2;
connection default; connection default;

19
mysql-test/main/flush_read_lock.test
View File

@@ -2100,6 +2100,7 @@ SET DEBUG_SYNC= 'RESET';
--echo # and DROP DATABASE --echo # and DROP DATABASE
--echo # --echo #
SET DEBUG_SYNC= 'ftwrl_before_lock SIGNAL ready WAIT_FOR go';
CREATE DATABASE mysqltest; CREATE DATABASE mysqltest;
CREATE TABLE mysqltest.t1(a INT); CREATE TABLE mysqltest.t1(a INT);
HANDLER mysqltest.t1 OPEN as t1; HANDLER mysqltest.t1 OPEN as t1;
@@ -2114,18 +2115,24 @@ SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL ready';
connect (con3,localhost,root,,); connect (con3,localhost,root,,);
SET DEBUG_SYNC= 'now WAIT_FOR ready'; SET DEBUG_SYNC= 'now WAIT_FOR ready';
disconnect con3;
connection default; connection default;
FLUSH TABLES WITH READ LOCK; send FLUSH TABLES WITH READ LOCK;
UNLOCK TABLES;
HANDLER t1 CLOSE;
connection con1;
connection con3;
SET DEBUG_SYNC= 'now WAIT_FOR ready';
disconnect con3;
connection con1;
--error 0,ER_NO_SUCH_TABLE --error 0,ER_NO_SUCH_TABLE
reap; reap;
UNLOCK TABLES; SET DEBUG_SYNC= 'now SIGNAL go';
disconnect con1; disconnect con1;
connection default;
reap;
UNLOCK TABLES;
HANDLER t1 CLOSE;
connection con2; connection con2;
reap; reap;
disconnect con2; disconnect con2;

1
sql/lock.cc
View File

@@ -1034,6 +1034,7 @@ bool Global_read_lock::lock_global_read_lock(THD *thd)
if another thread is trying to simultaneous drop the table if another thread is trying to simultaneous drop the table
*/ */
mysql_ha_cleanup_no_free(thd); mysql_ha_cleanup_no_free(thd);
DEBUG_SYNC(thd, "ftwrl_before_lock");
DBUG_ASSERT(! thd->mdl_context.is_lock_owner(MDL_key::BACKUP, "", "", DBUG_ASSERT(! thd->mdl_context.is_lock_owner(MDL_key::BACKUP, "", "",
MDL_BACKUP_FTWRL1)); MDL_BACKUP_FTWRL1));