diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-04-23 20:48:32 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-04-23 20:48:32 +0200 |
| commit | a4bccefb1153fee80de764e7231fecd7bf8c3f0e (patch) | |
| tree | 85f2311478921d1b1d7bfa35c076bbb78f2021c8 | |
| parent | 2655984ed4d22cf6eeec59637e1bf31d78cac679 (diff) | |
| download | mariadb-git-a4bccefb1153fee80de764e7231fecd7bf8c3f0e.tar.gz | |
MDEV-20372 - fix thread_pool_info
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.
| -rw-r--r-- | mysql-test/main/thread_pool_info.result | 6 | ||||
| -rw-r--r-- | mysql-test/main/thread_pool_info.test | 2 | ||||
| -rw-r--r-- | mysql-test/unstable-tests | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/main/thread_pool_info.result b/mysql-test/main/thread_pool_info.result index 802e2f3a7ec..5eeb0ca1d6a 100644 --- a/mysql-test/main/thread_pool_info.result +++ b/mysql-test/main/thread_pool_info.result @@ -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 diff --git a/mysql-test/main/thread_pool_info.test b/mysql-test/main/thread_pool_info.test index fe8acb6099a..914720af862 100644 --- a/mysql-test/main/thread_pool_info.test +++ b/mysql-test/main/thread_pool_info.test @@ -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 diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index 2bd2ae948c4..bb8ae21a638 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -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 |