mirror of
https://github.com/MariaDB/server.git
synced 2025-05-08 15:01:49 +03:00
3d6a89e792
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.
178 lines
5.9 KiB
Plaintext
178 lines
5.9 KiB
Plaintext
SET @start_global_value = @@global.lock_wait_timeout;
|
|
SELECT @start_global_value;
|
|
@start_global_value
|
|
31536000
|
|
SET @start_session_value = @@session.lock_wait_timeout;
|
|
SELECT @start_session_value;
|
|
@start_session_value
|
|
31536000
|
|
'#--------------------FN_DYNVARS_002_01-------------------------#'
|
|
SET @@global.lock_wait_timeout = 100;
|
|
SET @@global.lock_wait_timeout = DEFAULT;
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
31536000
|
|
SET @@session.lock_wait_timeout = 200;
|
|
SET @@session.lock_wait_timeout = DEFAULT;
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
31536000
|
|
'#--------------------FN_DYNVARS_002_02-------------------------#'
|
|
SET @@global.lock_wait_timeout = @start_global_value;
|
|
SELECT @@global.lock_wait_timeout = 31536000;
|
|
@@global.lock_wait_timeout = 31536000
|
|
1
|
|
SET @@session.lock_wait_timeout = @start_session_value;
|
|
SELECT @@session.lock_wait_timeout = 31536000;
|
|
@@session.lock_wait_timeout = 31536000
|
|
1
|
|
'#--------------------FN_DYNVARS_002_03-------------------------#'
|
|
SET @@global.lock_wait_timeout = 1;
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
1
|
|
SET @@global.lock_wait_timeout = 60020;
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
60020
|
|
SET @@global.lock_wait_timeout = 65535;
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
65535
|
|
'#--------------------FN_DYNVARS_002_04-------------------------#'
|
|
SET @@session.lock_wait_timeout = 1;
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
1
|
|
SET @@session.lock_wait_timeout = 50050;
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
50050
|
|
SET @@session.lock_wait_timeout = 65535;
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
65535
|
|
'#------------------FN_DYNVARS_002_05-----------------------#'
|
|
SET @@global.lock_wait_timeout = 0;
|
|
Warnings:
|
|
Warning 1292 Truncated incorrect lock_wait_timeout value: '0'
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
1
|
|
SET @@global.lock_wait_timeout = -1024;
|
|
Warnings:
|
|
Warning 1292 Truncated incorrect lock_wait_timeout value: '-1024'
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
1
|
|
SET @@global.lock_wait_timeout = 31536001;
|
|
Warnings:
|
|
Warning 1292 Truncated incorrect lock_wait_timeout value: '31536001'
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
31536000
|
|
SET @@global.lock_wait_timeout = ON;
|
|
ERROR 42000: Incorrect argument type to variable 'lock_wait_timeout'
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
31536000
|
|
SET @@global.lock_wait_timeout = OFF;
|
|
ERROR 42000: Incorrect argument type to variable 'lock_wait_timeout'
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
31536000
|
|
SET @@global.lock_wait_timeout = test;
|
|
ERROR 42000: Incorrect argument type to variable 'lock_wait_timeout'
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
31536000
|
|
SET @@session.lock_wait_timeout = 0;
|
|
Warnings:
|
|
Warning 1292 Truncated incorrect lock_wait_timeout value: '0'
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
1
|
|
SET @@session.lock_wait_timeout = -2;
|
|
Warnings:
|
|
Warning 1292 Truncated incorrect lock_wait_timeout value: '-2'
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
1
|
|
SET @@session.lock_wait_timeout = 31537000;
|
|
Warnings:
|
|
Warning 1292 Truncated incorrect lock_wait_timeout value: '31537000'
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
31536000
|
|
SET @@session.lock_wait_timeout = ON;
|
|
ERROR 42000: Incorrect argument type to variable 'lock_wait_timeout'
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
31536000
|
|
SET @@session.lock_wait_timeout = OFF;
|
|
ERROR 42000: Incorrect argument type to variable 'lock_wait_timeout'
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
31536000
|
|
SET @@session.lock_wait_timeout = test;
|
|
ERROR 42000: Incorrect argument type to variable 'lock_wait_timeout'
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
31536000
|
|
'#------------------FN_DYNVARS_002_06-----------------------#'
|
|
SELECT @@global.lock_wait_timeout = VARIABLE_VALUE
|
|
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
|
|
WHERE VARIABLE_NAME='lock_wait_timeout';
|
|
@@global.lock_wait_timeout = VARIABLE_VALUE
|
|
1
|
|
'#------------------FN_DYNVARS_002_07-----------------------#'
|
|
SELECT @@session.lock_wait_timeout = VARIABLE_VALUE
|
|
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
|
|
WHERE VARIABLE_NAME='lock_wait_timeout';
|
|
@@session.lock_wait_timeout = VARIABLE_VALUE
|
|
1
|
|
'#------------------FN_DYNVARS_002_08-----------------------#'
|
|
SET @@global.lock_wait_timeout = TRUE;
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
1
|
|
SET @@global.lock_wait_timeout = FALSE;
|
|
Warnings:
|
|
Warning 1292 Truncated incorrect lock_wait_timeout value: '0'
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
1
|
|
'#---------------------FN_DYNVARS_001_09----------------------#'
|
|
SET @@global.lock_wait_timeout = 10;
|
|
SET @@session.lock_wait_timeout = 11;
|
|
SELECT @@lock_wait_timeout = @@global.lock_wait_timeout;
|
|
@@lock_wait_timeout = @@global.lock_wait_timeout
|
|
0
|
|
'#---------------------FN_DYNVARS_001_10----------------------#'
|
|
SET @@lock_wait_timeout = 100;
|
|
SELECT @@lock_wait_timeout = @@local.lock_wait_timeout;
|
|
@@lock_wait_timeout = @@local.lock_wait_timeout
|
|
1
|
|
SELECT @@local.lock_wait_timeout = @@session.lock_wait_timeout;
|
|
@@local.lock_wait_timeout = @@session.lock_wait_timeout
|
|
1
|
|
'#---------------------FN_DYNVARS_001_11----------------------#'
|
|
SET lock_wait_timeout = 1;
|
|
SELECT @@lock_wait_timeout;
|
|
@@lock_wait_timeout
|
|
1
|
|
SELECT local.lock_wait_timeout;
|
|
ERROR 42S02: Unknown table 'local' in field list
|
|
SELECT session.lock_wait_timeout;
|
|
ERROR 42S02: Unknown table 'session' in field list
|
|
SELECT lock_wait_timeout = @@session.lock_wait_timeout;
|
|
ERROR 42S22: Unknown column 'lock_wait_timeout' in 'field list'
|
|
SET @@global.lock_wait_timeout = @start_global_value;
|
|
SELECT @@global.lock_wait_timeout;
|
|
@@global.lock_wait_timeout
|
|
31536000
|
|
SET @@session.lock_wait_timeout = @start_session_value;
|
|
SELECT @@session.lock_wait_timeout;
|
|
@@session.lock_wait_timeout
|
|
31536000
|