Update tests for integration with AC

Summary:
MySQL side update for D36781117. It fixes the tests and also temporarily disables features that will be re-enabled once they are fixed on the thread pool side.
1. Change `admission_control_queue_timeout` to 0 when possible until the non-zero timeout is supported.
2. Remove tests for `admission_control_by_trx` which is disabled for now. This feature is not used in prod (and has never been).
3. Filter out `__system__` AC entity.
4. Remove tests that kill thread waiting for AC until the feature is supported.

Reviewed By: shivamverma321

Differential Revision: D37299215

fbshipit-source-id: 04c10f5c85cff2bbb74af67a93640e71a8145a2e

Author: george-reynya

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

@@ -104,71 +104,19 @@ Query on existing thread pool connection is also rejected.
 select * from t1;
 ERROR HY000: Maximum waiting queries 5 reached for database `test_db`
 set @@global.thread_pool_max_waiting_queries=6;
-Kill a thread that is waiting for admission.
-select count(*) from t1;
-kill ID;
 use test_db;
 unlock tables;
 Verify the waiting queries received wakeup signal.
 select count(*) from t1;
 count(*)
 15
-set @save_admission_control_by_trx = @@global.thread_pool_admission_control_by_trx;
-select @save_admission_control_by_trx;
-@save_admission_control_by_trx
-0
-set @@global.thread_pool_max_running_queries=5;
-set @@global.thread_pool_max_waiting_queries=10;
-# By default, open transaction has no effect on running queries
-select count(*) from t1;
-count(*)
-15
-# Test: open transactions will take slots in running queries,
-#       and will not be blocked
-set @@global.thread_pool_admission_control_filter = 'BEGIN,COMMIT,ROLLBACK';
-select @@global.thread_pool_admission_control_filter;
-@@global.thread_pool_admission_control_filter
-BEGIN,COMMIT,ROLLBACK
-set @@global.thread_pool_admission_control_by_trx = true;
-SELECT @@global.thread_pool_admission_control_by_trx;
-@@global.thread_pool_admission_control_by_trx
-1
-Open transaction is able to continue running queries
-connection con_max_wait;
-New queries will be rejected (waiting queue is full)
-select * from t1;
-ERROR HY000: Maximum waiting queries 10 reached for database `test_db`
-New transactions will be rejected (waiting queue is full)
-begin;
-select * from t1;
-ERROR HY000: Maximum waiting queries 10 reached for database `test_db`
-aborted_queries will increase by 2
-Committing a transaction will free up the running query slots
-The waiting queries will be unblocked
-Check status variables
-include/assert.inc [DB Admission control waiting queries should be zero]
-include/assert.inc [DB Admission control running queries should be zero]
-include/assert.inc [DB Admission control aborted queries should be eight]
-select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
-SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
-test_db	0	0	8	0	13	0
-test_db2	0	0	0	0	0	0
-set @@global.thread_pool_admission_control_by_trx = @save_admission_control_by_trx;
-select @@global.thread_pool_admission_control_by_trx;
-@@global.thread_pool_admission_control_by_trx
-0
-set @@global.thread_pool_admission_control_filter = '';
-select @@global.thread_pool_admission_control_filter;
-@@global.thread_pool_admission_control_filter
-
-# End of open transaction test
 # Test admission_control_queue_timeout
 use test_db;
 set @@global.thread_pool_max_running_queries=1;
 set @@global.thread_pool_max_waiting_queries=5;
 set @save_admission_control_filter = @@global.thread_pool_admission_control_filter;
 set @save_admission_control_queue_timeout = @@global.thread_pool_admission_control_queue_timeout;
-set @@global.thread_pool_admission_control_queue_timeout = 100;
+set @@global.thread_pool_admission_control_queue_timeout = 0;
 set @@global.thread_pool_admission_control_filter = 'BEGIN,COMMIT,ROLLBACK';
 create table t2(a int primary key) engine=InnoDB;
 begin;
@@ -186,7 +134,7 @@ waiting_queries should be 0
 waiting_queries = 0
 select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
-test_db	0	0	8	1	15	0
+test_db	0	0	6	1	15	0
 test_db2	0	0	0	0	0	0
 set @@global.thread_pool_admission_control_filter = 'ROLLBACK,INSERT';
 create table t3(a int primary key) engine=InnoDB;
@@ -196,7 +144,7 @@ begin;
 insert into t3 values (1)||||
 select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
-test_db	0	1	8	1	17	0
+test_db	0	1	6	1	17	0
 test_db2	0	0	0	0	0	0
 SELECT should timeout
 select * from t3;
@@ -210,7 +158,7 @@ begin;
 insert into t3 values (1)||||
 select * from information_schema.tp_admission_control_entities where schema_name like 'test_db%' order by schema_name;
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
-test_db	0	0	8	2	17	0
+test_db	0	0	6	2	17	0
 test_db2	0	0	0	0	0	0
 SELECT should succeed
 select * from t3;

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

@@ -7,6 +7,8 @@ set @start_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
 set @@global.innodb_lock_wait_timeout = 10000;
 set @start_admission_control_filter = @@global.thread_pool_admission_control_filter;
 set @@global.thread_pool_admission_control_filter = 'COMMIT';
+set @start_admission_control_queue_timeout = @@global.thread_pool_admission_control_queue_timeout;
+set @@global.thread_pool_admission_control_queue_timeout = 0;
 create table t1 (a int) engine=innodb;
 insert into t1 values(1);
 begin;
@@ -15,6 +17,7 @@ update t1 set a=2 where a=1;
 update t1 set a=2 where a=1;
 update t1 set a=2 where a=1;
 update t1 set a=2 where a=1;
+Wait to confirm that all 4 queries are running.
 set @@global.thread_pool_admission_control_filter = 'USE';
 select @@global.thread_pool_admission_control_filter;
 @@global.thread_pool_admission_control_filter
@@ -75,8 +78,7 @@ select @@global.thread_pool_admission_control_filter;
 @@global.thread_pool_admission_control_filter
 
 select count(*) from t1;
-count(*)
-1
+ERROR HY000: Got timeout while waiting on admission control queue for database `test_db`
 set @@global.thread_pool_admission_control_by_trx = @save_admission_control_by_trx;
 select @@global.thread_pool_admission_control_by_trx;
 @@global.thread_pool_admission_control_by_trx
@@ -89,5 +91,6 @@ commit;
 set @@global.thread_pool_max_running_queries = @start_max_running_queries;
 set @@global.innodb_lock_wait_timeout = @start_innodb_lock_wait_timeout;
 set @@global.thread_pool_admission_control_filter = @start_admission_control_filter;
+set @@global.thread_pool_admission_control_queue_timeout = @start_admission_control_queue_timeout;
 drop database test_db;
 drop user test_user@localhost;

mysql-test/suite/thread_pool/r/admission_control_queue.result

@@ -18,15 +18,15 @@ select GET_LOCK('lock1', -1);
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
 test_db	0	1	0	0	1	0
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 test_db	0	0	1	0	0
 select RELEASE_LOCK('lock1');
 RELEASE_LOCK('lock1')
 1
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 GET_LOCK('lock1', -1)
 1
@@ -41,13 +41,13 @@ select GET_LOCK('lock1', -1);
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
 test_db	0	1	0	0	1	0
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 test_db	1	0	1	0	0
 select RELEASE_LOCK('lock1');
 RELEASE_LOCK('lock1')
 1
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 GET_LOCK('lock1', -1)
 1
@@ -62,15 +62,15 @@ select GET_LOCK('lock1', -1);
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
 test_db	0	1	0	0	1	0
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 test_db	2	0	1	0	0
 select RELEASE_LOCK('lock1');
 RELEASE_LOCK('lock1')
 1
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 GET_LOCK('lock1', -1)
 1
@@ -93,7 +93,7 @@ select GET_LOCK('lock1', -1);
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
 test_db	0	5	0	0	5	0
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 test_db	0	0	5	0	0
 # Set up 5 waiting queries each for queue 1 and 2
@@ -111,7 +111,7 @@ select GET_LOCK('lock2', -1);
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
 test_db	10	5	0	0	15	0
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 test_db	0	0	5	0	0
 test_db	1	5	0	0	0
@@ -123,7 +123,7 @@ RELEASE_LOCK('lock1')
 select * from information_schema.tp_admission_control_entities where waiting_queries + running_queries + aborted_queries + timeout_queries != 0 and schema_name like 'test%';
 SCHEMA_NAME	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES	CONNECTIONS	REJECTED_CONNECTIONS
 test_db	5	5	0	0	10	0
-select * from information_schema.tp_admission_control_queue;
+select * from information_schema.tp_admission_control_queue where schema_name like 'test%';
 SCHEMA_NAME	QUEUE_ID	WAITING_QUERIES	RUNNING_QUERIES	ABORTED_QUERIES	TIMEOUT_QUERIES
 test_db	1	3	2	0	0
 test_db	2	2	3	0	0

mysql-test/suite/thread_pool/r/admission_control_yield.result

@@ -10,7 +10,7 @@ set @save_admission_control_yield_freq = @@thread_pool_admission_control_yield_f
 set global thread_pool_max_running_queries = 1;
 set global thread_pool_max_waiting_queries = 2000;
 set global thread_pool_admission_control_filter = 'SET';
-set thread_pool_admission_control_queue_timeout = 5000;
+set thread_pool_admission_control_queue_timeout = 0;
 #
 # Test admission_control_wait_events = SLEEP
 #
@@ -86,9 +86,6 @@ set global thread_pool_admission_control_wait_events = 'YIELD';
 set global thread_pool_admission_control_yield_freq = 1;
 select * from t2 a, t2 b, t2 c, t2 d, t2 e, t2 f, t2 g, t2 h limit 10000000000, 1;;
 Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist where state = 'Sending data'
-select 1;
-1
-1
 drop table t1;
 drop table t2;
 ERROR 70100: Query execution was interrupted

mysql-test/suite/thread_pool/r/admission_control_yield_debug.result

@@ -8,7 +8,7 @@ set @save_max_waiting_queries = @@thread_pool_max_waiting_queries;
 set @save_admission_control_wait_events = @@thread_pool_admission_control_wait_events;
 set global thread_pool_max_running_queries = 1;
 set global thread_pool_max_waiting_queries = 2000;
-set thread_pool_admission_control_queue_timeout = 100;
+set thread_pool_admission_control_queue_timeout = 0;
 #
 # Test admission_control_wait_events = NET_IO
 # We need debug sync to simulate slow clients
@@ -20,9 +20,6 @@ select 1;
 ERROR HY000: Got timeout while waiting on admission control queue for database `test_db`
 set global thread_pool_admission_control_wait_events = 'NET_IO';
 SELECT REPEAT('X', @@max_allowed_packet);;
-select 1;
-1
-1
 set global thread_pool_max_running_queries = @save_max_running_queries;
 set global thread_pool_max_waiting_queries = @save_max_waiting_queries;
 set global thread_pool_admission_control_wait_events = @save_admission_control_wait_events;