Skip to content

Commit 696ecb6

Browse files
george-reynyainikep
george-reynya
authored and
inikep
committed
[thread_pool] Call thd_wait_* callbacks for admitting new query in thread pool plugin
Summary: 1. Change the code to admit new query through `thd_wait_begin/end` callbacks using new `THD_WAIT_ADMIT` wait type. 2. Move yield counting to the callbacks to unify the code between the server and the plugin. `yield_cond` exposes the yield condition to check once the yield counter says that yield is needed. 3. Expose all wait events through `admission_control_wait_events` var. This is especially needed for `USER_LOCK` which still controls innodb thread concurrency yield. 4. Copy and fix up admission control tests to the thread_pool suite. Only the var and table names are changed to refer to thread_pool plugin. The results have been diffed with original tests to make sure they are identical (except for var/table names). Reviewed By: lth Differential Revision: D27593084 --------------------------------------------------------------------------------------------- use lambda instead of std::bind (facebook#1243) Summary: std::bind(yield_condition, table) will generate a functor which size is larger than std::function's local buf, thus std::function needs to new/delete memory to store the functor. This PR use the lambda which just capture one pointer(table), which size can fit into std::function's local buf thus new/delete is not needed. Pull Request resolved: facebook#1243 Reviewed By: lth Differential Revision: D40858532 Pulled By: hermanlee fbshipit-source-id: f7431f7
1 parent 0e9f215 commit 696ecb6

36 files changed

+2218
-60
lines changed

‎include/mysql/service_thd_wait.h

+9-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
class THD;
5757
#define MYSQL_THD THD *
5858

59-
/*
59+
/**
6060
One should only report wait events that could potentially block for a
6161
long time. A mutex wait is too short of an event to report. The reason
6262
is that an event which is reported leads to a new thread starts
@@ -69,9 +69,13 @@ class THD;
6969
holds true for global read locks, table locks and other meta data locks.
7070
Another event of interest is going to sleep for an extended time.
7171
72-
Note that user-level locks no longer use THD_WAIT_USER_LOCK wait type.
72+
@note User-level locks no longer use THD_WAIT_USER_LOCK wait type.
7373
Since their implementation relies on metadata locks manager it uses
7474
THD_WAIT_META_DATA_LOCK instead.
75+
76+
@note THD_WAIT_ADMIT is a fake wait type communicating that query has been
77+
parsed and is ready for execution. The query attributes and sql command
78+
are available at this point.
7579
*/
7680
typedef enum _thd_wait_type_e {
7781
THD_WAIT_SLEEP = 1,
@@ -80,14 +84,15 @@ typedef enum _thd_wait_type_e {
8084
THD_WAIT_GLOBAL_LOCK = 4,
8185
THD_WAIT_META_DATA_LOCK = 5,
8286
THD_WAIT_TABLE_LOCK = 6,
83-
THD_WAIT_USER_LOCK = 7,
87+
THD_WAIT_INNODB_CONC = 7,
8488
THD_WAIT_BINLOG = 8,
8589
THD_WAIT_GROUP_COMMIT = 9,
8690
THD_WAIT_SYNC = 10,
8791
THD_WAIT_FOR_HLC = 11,
8892
THD_WAIT_NET_IO = 12,
8993
THD_WAIT_YIELD = 13,
90-
THD_WAIT_LAST = 14
94+
THD_WAIT_ADMIT = 14,
95+
THD_WAIT_LAST = 15
9196
} thd_wait_type;
9297

9398
extern "C" struct thd_wait_service_st {

‎mysql-test/suite/sys_vars/r/admission_control_wait_events_basic.result

+7-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ SET GLOBAL admission_control_wait_events='YIELD';
1818
SELECT @@global.admission_control_wait_events;
1919
@@global.admission_control_wait_events
2020
YIELD
21-
SET GLOBAL admission_control_wait_events='SLEEP,NET_IO,META_DATA_LOCK,ROW_LOCK,YIELD';
21+
SET GLOBAL admission_control_wait_events='SLEEP,ROW_LOCK,META_DATA_LOCK,INNODB_CONC,NET_IO,YIELD';
2222
SELECT @@global.admission_control_wait_events;
2323
@@global.admission_control_wait_events
24-
SLEEP,ROW_LOCK,META_DATA_LOCK,NET_IO,YIELD
24+
SLEEP,ROW_LOCK,META_DATA_LOCK,INNODB_CONC,NET_IO,YIELD
25+
SET GLOBAL admission_control_wait_events='SLEEP,SLEEP';
26+
SELECT @@global.admission_control_wait_events;
27+
@@global.admission_control_wait_events
28+
SLEEP
2529
SET GLOBAL admission_control_wait_events='YIELD,NONEXISTING_BIT';
2630
ERROR 42000: Variable 'admission_control_wait_events' can't be set to the value of 'NONEXISTING_BIT'
2731
SELECT @@global.admission_control_wait_events;
2832
@@global.admission_control_wait_events
29-
SLEEP,ROW_LOCK,META_DATA_LOCK,NET_IO,YIELD
33+
SLEEP
3034
set global admission_control_wait_events = @saved_admission_control_wait_events;

‎mysql-test/suite/sys_vars/t/admission_control_wait_events_basic.test

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ SELECT @@global.admission_control_wait_events;
1212
SET GLOBAL admission_control_wait_events='YIELD';
1313
SELECT @@global.admission_control_wait_events;
1414

15-
SET GLOBAL admission_control_wait_events='SLEEP,NET_IO,META_DATA_LOCK,ROW_LOCK,YIELD';
15+
SET GLOBAL admission_control_wait_events='SLEEP,ROW_LOCK,META_DATA_LOCK,INNODB_CONC,NET_IO,YIELD';
16+
SELECT @@global.admission_control_wait_events;
17+
18+
# check that repeating the same value is OK
19+
SET GLOBAL admission_control_wait_events='SLEEP,SLEEP';
1620
SELECT @@global.admission_control_wait_events;
1721

1822
# checking that setting variable to a non existing value raises error

‎mysql-test/suite/thread_pool/r/admission_control.result

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
create database test_db;
2+
create database test_db2;
3+
create user 'test_user'@'localhost';
4+
grant all on test_db.* to 'test_user'@'localhost';
5+
grant all on test_db2.* to 'test_user'@'localhost';
6+
grant all on test.* to 'test_user'@'localhost';
7+
use test_db2;
8+
use test_db;
9+
set @start_max_running_queries= @@global.thread_pool_max_running_queries;
10+
set @start_max_waiting_queries= @@global.thread_pool_max_waiting_queries;
11+
set @@global.thread_pool_max_running_queries=10;
12+
set @@global.thread_pool_max_waiting_queries=5;
13+
create table t1(a int) engine=InnoDB;
14+
lock table t1 write;
15+
Threads waiting for admission will have appropriate state set in processlist.
16+
Super user is exempted from admission control checks.
17+
select * from t1;
18+
a
19+
set @@global.thread_pool_admission_control_filter = 'USE';
20+
select @@global.thread_pool_admission_control_filter;
21+
@@global.thread_pool_admission_control_filter
22+
USE
23+
Maximum waiting queries reached. So this would hit an error.
24+
use test_db;
25+
select * from t1||||
26+
ERROR HY000: Maximum waiting queries 5 reached for database `test_db`
27+
Maximum waiting queries reached. So this would hit an error.
28+
use test_db2;
29+
create table t1_test(aaa int);
30+
insert into t1_test values (1);
31+
select aaa from t1_test;
32+
drop table t1_test;
33+
use test_db;
34+
select * from t1||||
35+
aaa
36+
1
37+
ERROR HY000: Maximum waiting queries 5 reached for database `test_db`
38+
use test_db;
39+
select * from t1;
40+
ERROR HY000: Maximum waiting queries 5 reached for database `test_db`
41+
set @@global.thread_pool_admission_control_filter = '';
42+
select @@global.thread_pool_admission_control_filter;
43+
@@global.thread_pool_admission_control_filter
44+
45+
Check status variables
46+
aborted_queries = 3
47+
running_queries = 10
48+
waiting_queries = 5
49+
select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
50+
SCHEMA_NAME WAITING_QUERIES RUNNING_QUERIES ABORTED_QUERIES TIMEOUT_QUERIES CONNECTIONS REJECTED_CONNECTIONS
51+
test_db 5 10 3 0 15 0
52+
test_db2 0 0 0 0 0 0
53+
Filled up queues on one db doesn't affect queries on other db.
54+
use test_db2;
55+
select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
56+
SCHEMA_NAME WAITING_QUERIES RUNNING_QUERIES ABORTED_QUERIES TIMEOUT_QUERIES CONNECTIONS REJECTED_CONNECTIONS
57+
test_db 5 10 3 0 15 0
58+
test_db2 0 1 0 0 1 0
59+
set @@global.thread_pool_max_waiting_queries=6;
60+
Kill a thread that is waiting for admission.
61+
select count(*) from t1;
62+
kill ID;
63+
use test_db;
64+
unlock tables;
65+
Verify the waiting queries received wakeup signal.
66+
select count(*) from t1;
67+
count(*)
68+
15
69+
set @save_admission_control_by_trx = @@global.thread_pool_admission_control_by_trx;
70+
select @save_admission_control_by_trx;
71+
@save_admission_control_by_trx
72+
0
73+
set @@global.thread_pool_max_running_queries=5;
74+
set @@global.thread_pool_max_waiting_queries=10;
75+
# By default, open transaction has no effect on running queries
76+
select count(*) from t1;
77+
count(*)
78+
15
79+
# Test: open transactions will take slots in running queries,
80+
# and will not be blocked
81+
set @@global.thread_pool_admission_control_filter = 'BEGIN,COMMIT,ROLLBACK';
82+
select @@global.thread_pool_admission_control_filter;
83+
@@global.thread_pool_admission_control_filter
84+
BEGIN,COMMIT,ROLLBACK
85+
set @@global.thread_pool_admission_control_by_trx = true;
86+
SELECT @@global.thread_pool_admission_control_by_trx;
87+
@@global.thread_pool_admission_control_by_trx
88+
1
89+
Open transaction is able to continue running queries
90+
connection con_max_wait;
91+
New queries will be rejected (waiting queue is full)
92+
select * from t1;
93+
ERROR HY000: Maximum waiting queries 10 reached for database `test_db`
94+
New transactions will be rejected (waiting queue is full)
95+
begin;
96+
select * from t1;
97+
ERROR HY000: Maximum waiting queries 10 reached for database `test_db`
98+
aborted_queries will increase by 2
99+
Committing a transaction will free up the running query slots
100+
The waiting queries will be unblocked
101+
Check status variables
102+
include/assert.inc [DB Admission control waiting queries should be zero]
103+
include/assert.inc [DB Admission control running queries should be zero]
104+
include/assert.inc [DB Admission control aborted queries should be five]
105+
select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
106+
SCHEMA_NAME WAITING_QUERIES RUNNING_QUERIES ABORTED_QUERIES TIMEOUT_QUERIES CONNECTIONS REJECTED_CONNECTIONS
107+
test_db 0 0 5 0 13 0
108+
test_db2 0 0 0 0 0 0
109+
set @@global.thread_pool_admission_control_by_trx = @save_admission_control_by_trx;
110+
select @@global.thread_pool_admission_control_by_trx;
111+
@@global.thread_pool_admission_control_by_trx
112+
0
113+
set @@global.thread_pool_admission_control_filter = '';
114+
select @@global.thread_pool_admission_control_filter;
115+
@@global.thread_pool_admission_control_filter
116+
117+
# End of open transaction test
118+
# Test admission_control_queue_timeout
119+
use test_db;
120+
set @@global.thread_pool_max_running_queries=1;
121+
set @@global.thread_pool_max_waiting_queries=5;
122+
set @save_admission_control_filter = @@global.thread_pool_admission_control_filter;
123+
set @save_admission_control_queue_timeout = @@global.thread_pool_admission_control_queue_timeout;
124+
set @@global.thread_pool_admission_control_queue_timeout = 100;
125+
set @@global.thread_pool_admission_control_filter = 'BEGIN,COMMIT,ROLLBACK';
126+
create table t2(a int primary key) engine=InnoDB;
127+
begin;
128+
insert into t2 values (1);
129+
begin;
130+
insert into t2 values (1);
131+
insert into t2 values (2);
132+
ERROR HY000: Got timeout while waiting on admission control queue for database `test_db`
133+
rollback;
134+
rollback;
135+
drop table t2;
136+
set @@global.thread_pool_admission_control_filter = @save_admission_control_filter;
137+
set @@global.thread_pool_admission_control_queue_timeout = @save_admission_control_queue_timeout;
138+
timeout_queries should be 1
139+
timeout_queries = 1
140+
waiting_queries should be 0
141+
waiting_queries = 0
142+
select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
143+
SCHEMA_NAME WAITING_QUERIES RUNNING_QUERIES ABORTED_QUERIES TIMEOUT_QUERIES CONNECTIONS REJECTED_CONNECTIONS
144+
test_db 0 0 5 1 15 0
145+
test_db2 0 0 0 0 0 0
146+
reset global.thread_pool_max_running_queries and global.thread_pool_max_waiting_queries
147+
set @@global.thread_pool_max_running_queries=10;
148+
set @@global.thread_pool_max_waiting_queries=5;
149+
Run parallel load and drop the database.
150+
set @@global.thread_pool_max_waiting_queries=0;
151+
Cleanup.
152+
Verify there are no waiting threads.
153+
select count(*) from information_schema.processlist where state='waiting for admission';
154+
count(*)
155+
0
156+
select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
157+
SCHEMA_NAME WAITING_QUERIES RUNNING_QUERIES ABORTED_QUERIES TIMEOUT_QUERIES CONNECTIONS REJECTED_CONNECTIONS
158+
set @@global.thread_pool_max_running_queries=@start_max_running_queries;
159+
set @@global.thread_pool_max_waiting_queries=@start_max_waiting_queries;
160+
drop user test_user@localhost;

‎mysql-test/suite/thread_pool/r/admission_control_hang.result

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
create database test_db;
2+
create user test_user@localhost;
3+
grant all on test_db.* to test_user@localhost;
4+
set @start_max_running_queries = @@global.max_running_queries;
5+
set @@global.max_running_queries = 4;
6+
set @start_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
7+
set @@global.innodb_lock_wait_timeout = 10000;
8+
set @start_admission_control_filter = @@global.admission_control_filter;
9+
set @@global.admission_control_filter = 'COMMIT';
10+
create table t1 (a int) engine=innodb;
11+
insert into t1 values(1);
12+
begin;
13+
update t1 set a=2 where a=1;
14+
update t1 set a=2 where a=1;
15+
update t1 set a=2 where a=1;
16+
update t1 set a=2 where a=1;
17+
update t1 set a=2 where a=1;
18+
set @@global.admission_control_filter = 'USE';
19+
select @@global.admission_control_filter;
20+
@@global.admission_control_filter
21+
USE
22+
use test;
23+
use test_db;
24+
set @@global.admission_control_filter = 'ALTER,BEGIN,COMMIT,CREATE,DELETE,DROP,INSERT,LOAD,SELECT,SET,REPLACE,TRUNCATE,UPDATE,SHOW,ROLLBACK';
25+
select @@global.admission_control_filter;
26+
@@global.admission_control_filter
27+
ALTER,BEGIN,COMMIT,CREATE,DELETE,DROP,INSERT,LOAD,SELECT,SET,REPLACE,ROLLBACK,TRUNCATE,UPDATE,SHOW
28+
create table t2(a int) engine=innodb;
29+
begin;
30+
insert into t2 values(1);
31+
update t2 set a=2 where a=1;
32+
commit;
33+
SHOW TABLES LIKE 't2';
34+
Tables_in_test_db (t2)
35+
t2
36+
begin;
37+
alter table t2 rename t3;
38+
select * from t3;
39+
a
40+
2
41+
delete from t3;
42+
set @val = 1;
43+
truncate table t3;
44+
rollback;
45+
drop table t3;
46+
set @save_admission_control_by_trx = @@global.admission_control_by_trx;
47+
select @save_admission_control_by_trx;
48+
@save_admission_control_by_trx
49+
0
50+
# Turn on admission_control_by_trx
51+
set @@global.admission_control_by_trx = true;
52+
SELECT @@global.admission_control_by_trx;
53+
@@global.admission_control_by_trx
54+
1
55+
create table t2(a int) engine=innodb;
56+
begin;
57+
insert into t2 values(1);
58+
update t2 set a=2 where a=1;
59+
commit;
60+
SHOW TABLES LIKE 't2';
61+
Tables_in_test_db (t2)
62+
t2
63+
begin;
64+
alter table t2 rename t3;
65+
select * from t3;
66+
a
67+
2
68+
delete from t3;
69+
set @val = 1;
70+
truncate table t3;
71+
rollback;
72+
drop table t3;
73+
set @@global.admission_control_filter = default;
74+
select @@global.admission_control_filter;
75+
@@global.admission_control_filter
76+
77+
select count(*) from t1;
78+
count(*)
79+
1
80+
set @@global.admission_control_by_trx = @save_admission_control_by_trx;
81+
select @@global.admission_control_by_trx;
82+
@@global.admission_control_by_trx
83+
0
84+
set @@global.admission_control_filter = 'COMMIT';
85+
select @@global.admission_control_filter;
86+
@@global.admission_control_filter
87+
COMMIT
88+
commit;
89+
set @@global.max_running_queries = @start_max_running_queries;
90+
set @@global.innodb_lock_wait_timeout = @start_innodb_lock_wait_timeout;
91+
set @@global.admission_control_filter = @start_admission_control_filter;
92+
drop database test_db;
93+
drop user test_user@localhost;

‎mysql-test/suite/thread_pool/r/admission_control_multi_query.result

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
create database test_db;
2+
create user test_user@localhost identified with 'mysql_native_password' BY '';
3+
grant all on test_db.* to test_user@localhost;
4+
grant all on test.* to test_user@localhost;
5+
use test_db;
6+
create table t1 (a int primary key, b int) engine=InnoDB;
7+
drop database test_db;
8+
drop user test_user@localhost;

‎mysql-test/suite/thread_pool/r/admission_control_multi_query_wait_events.result

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
create database test_db;
2+
create user test_user@localhost identified with 'mysql_native_password' BY '';
3+
grant all on test_db.* to test_user@localhost;
4+
grant all on test.* to test_user@localhost;
5+
use test_db;
6+
create table t1 (a int primary key, b int) engine=InnoDB;
7+
drop database test_db;
8+
drop user test_user@localhost;

‎mysql-test/suite/thread_pool/r/admission_control_multi_query_weighted.result

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
create database test_db;
2+
create user test_user@localhost identified with 'mysql_native_password' BY '';
3+
grant all on test_db.* to test_user@localhost;
4+
grant all on test.* to test_user@localhost;
5+
use test_db;
6+
create table t1 (a int primary key, b int) engine=InnoDB;
7+
drop database test_db;
8+
drop user test_user@localhost;

0 commit comments

Comments
 (0)