diff options
author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-02-11 11:23:39 +0100 |
---|---|---|
committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-02-11 11:23:39 +0100 |
commit | 3d6a89e7929292a8ca4c369d03e7d723045626b6 (patch) | |
tree | 61c2376a790a37e251fcfa30ba118b660e25e60d /mysql-test/r/lock_multi.result | |
parent | d7f203c79fdb25bef8756016efc63628187520cd (diff) | |
download | mariadb-git-3d6a89e7929292a8ca4c369d03e7d723045626b6.tar.gz |
Bug #45225 Locking: hang if drop table with no timeout
This patch introduces timeouts for metadata locks.
The timeout is specified in seconds using the new dynamic system
variable "lock_wait_timeout" which has both GLOBAL and SESSION
scopes. Allowed values range from 1 to 31536000 seconds (= 1 year).
The default value is 1 year.
The new server parameter "lock-wait-timeout" can be used to set
the default value parameter upon server startup.
"lock_wait_timeout" applies to all statements that use metadata locks.
These include DML and DDL operations on tables, views, stored procedures
and stored functions. They also include LOCK TABLES, FLUSH TABLES WITH
READ LOCK and HANDLER statements.
The patch also changes thr_lock.c code (table data locks used by MyISAM
and other simplistic engines) to use the same system variable.
InnoDB row locks are unaffected.
One exception to the handling of the "lock_wait_timeout" variable
is delayed inserts. All delayed inserts are executed with a timeout
of 1 year regardless of the setting for the global variable. As the
connection issuing the delayed insert gets no notification of
delayed insert timeouts, we want to avoid unnecessary timeouts.
It's important to note that the timeout value is used for each lock
acquired and that one statement can take more than one lock.
A statement can therefore block for longer than the lock_wait_timeout
value before reporting a timeout error. When lock timeout occurs,
ER_LOCK_WAIT_TIMEOUT is reported.
Test case added to lock_multi.test.
include/my_pthread.h:
Added macros for comparing two timespec structs.
include/thr_lock.h:
Introduced timeouts for thr_lock.c locks.
mysql-test/r/mysqld--help-notwin.result:
Updated result file with the new server variable.
mysql-test/r/mysqld--help-win.result:
Updated result file with the new server variable.
mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result:
Added basic test for the new server variable.
mysql-test/suite/sys_vars/t/lock_wait_timeout_basic.test:
Added basic test for the new server variable.
mysys/thr_lock.c:
Introduced timeouts for thr_lock.c locks.
sql/mdl.cc:
Introduced timeouts for metadata locks.
sql/mdl.h:
Introduced timeouts for metadata locks.
sql/sql_base.cc:
Introduced timeouts in tdc_wait_for_old_versions().
sql/sql_class.h:
Added new server variable lock_wait_timeout.
sql/sys_vars.cc:
Added new server variable lock_wait_timeout.
Diffstat (limited to 'mysql-test/r/lock_multi.result')
-rw-r--r-- | mysql-test/r/lock_multi.result | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index 7a5fb445edf..d67868e927a 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -348,3 +348,91 @@ commit; # Switching to connection 'default'. drop view v1; drop table t1; +# +# Bug#45225 Locking: hang if drop table with no timeout +# +# These tests also provide function coverage for the +# lock_wait_timeout server variable. +# +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (id int); +SET SESSION lock_wait_timeout= 1; +# +# Test 1: acquire exclusive lock +# +# Connection default +START TRANSACTION; +INSERT INTO t1 VALUES (1); +# Connection 2 +DROP TABLE t1; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +# Connection default +COMMIT; +# +# Test 2: upgrade shared lock +# +# Connection default +START TRANSACTION; +SELECT * FROM t1; +id +1 +# Connection 2 +ALTER TABLE t1 RENAME TO t2; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +# Connection default +COMMIT; +# +# Test 3: acquire shared lock +# +# Connection default +LOCK TABLE t1 WRITE; +# Connection 2 +INSERT INTO t1(id) VALUES (2); +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +# Connection default +UNLOCK TABLES; +# +# Test 4: table level locks +# +# Connection default +LOCK TABLE t1 READ; +# Connection 2 +INSERT INTO t1(id) VALUES(4); +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +# Connection default +UNLOCK TABLES; +# +# Test 5: Waiting on Table Definition Cache (TDC) +# +# Connection default +LOCK TABLE t1 READ; +# Connection con3 +# Sending: +FLUSH TABLES; +# Connection con2 +SELECT * FROM t1; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +# Connection default +UNLOCK TABLES; +# Connection con3 +# Reaping: FLUSH TABLES +# +# Test 6: Timeouts in I_S queries +# +# Connection default +CREATE TABLE t2 (id INT); +LOCK TABLE t2 WRITE; +# Connection con3 +# Sending: +DROP TABLE t1, t2; +# Connection con2 +SELECT table_name, table_comment FROM information_schema.tables +WHERE table_schema= 'test' AND table_name= 't1'; +table_name table_comment +t1 Lock wait timeout exceeded; try restarting transaction +# Connection default +UNLOCK TABLES; +# Connection con3 +# Reaping: DROP TABLE t1, t2 +# Connection default +# Cleanup |