database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-20372 - fix thread_pool_info

Browse Source 
In rare cases, both listener and worker can do poll at the same time
(one of them will return events, another one no events)

Fix test query to account for it.
This commit is contained in:
Vladislav Vaintroub
2020-04-23 20:48:32 +02:00
parent 2655984ed4
commit a4bccefb11
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/main/thread_pool_info.result
View File

@ -56,9 +56,9 @@ FLUSH THREAD_POOL_STATS;
SELECT SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER)
1
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER)
2
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3 FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3
1
DESC INFORMATION_SCHEMA.THREAD_POOL_WAITS;
Field Type Null Key Default Extra
REASON varchar(16) NO

2
mysql-test/main/thread_pool_info.test
View File

@ -29,7 +29,7 @@ SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) > 0 FROM INFORMATION_SCHEMA.THREAD
--disable_ps_protocol
FLUSH THREAD_POOL_STATS;
SELECT SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3 FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
--enable_ps_protocol
#I_S.THREAD_POOL_WAITS

1
mysql-test/unstable-tests
View File

@ -173,7 +173,6 @@ main.status : MDEV-13255 - Wrong result
main.subselect : MDEV-20551 - Valgrind failure
main.subselect_innodb : MDEV-10614 - Wrong result
main.tc_heuristic_recover : MDEV-14189 - Wrong result
main.thread_pool_info : MDEV-20372 - thread_pool_info fails randomly in 10.5
main.timezone2 : Modified in 10.4.12
main.tls_version : MDEV-21965 - old TLS versions don't work on latest Debian and Ubuntu releases
main.tls_version1 : MDEV-21965 - old TLS versions don't work on latest Debian and Ubuntu releases