1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-11221 - main.events_restart failed in bb

Browse Source 
This is an addition to original fix. Buildbot revealed another sporadic failure
in perfschema.threads_mysql test. Tests relies on data stored in
performance_schema.threads, while performing waits on
information_schema.processlist. These tables are not updated synchronously.

Fixed by performing waits on performance_schema.threads instead.
This commit is contained in:
Sergey Vojtovich 2017-03-02 12:35:31 +04:00
parent c1c5b7a8d2
commit 71f53bf72d
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/perfschema/include/pfs_no_running_event_scheduler.inc Normal file
View File

@ -0,0 +1,10 @@
# threads are removed from:
# - information_schema.processlist
# - performance_schema.threads
# at different times, so we may have to wait a little more
# for the event_scheduler to shutdown
#
let $wait_condition=
SELECT COUNT(*) = 0 FROM performance_schema.threads
WHERE name like 'thread/sql/event%';
--source include/wait_condition.inc

10
mysql-test/suite/perfschema/include/pfs_running_event_scheduler.inc Normal file
View File

@ -0,0 +1,10 @@
# threads are removed from:
# - information_schema.processlist
# - performance_schema.threads
# at different times, so we may have to wait a little more
# for the event_scheduler to shutdown
#
let $wait_condition=
SELECT COUNT(*) = 1 FROM performance_schema.threads
WHERE name like 'thread/sql/event%';
--source include/wait_condition.inc

18
mysql-test/suite/perfschema/t/threads_mysql.test
View File

@ -9,22 +9,10 @@
# Ensure that the event scheduler (started via threads_mysql-master.opt) # Ensure that the event scheduler (started via threads_mysql-master.opt)
# is really running. # is really running.
--source include/running_event_scheduler.inc --source include/pfs_running_event_scheduler.inc
SET GLOBAL event_scheduler = OFF; SET GLOBAL event_scheduler = OFF;
--source include/no_running_event_scheduler.inc --source include/pfs_no_running_event_scheduler.inc
# threads are removed from:
# - information_schema.processlist
# - performance_schema.threads
# at different times, so we may have to wait a little more
# for the event_scheduler to shutdown
#
let $wait_timeout= 1;
let $wait_condition=
SELECT COUNT(*) = 0 FROM performance_schema.threads
WHERE name like 'thread/sql/event%';
--source include/wait_condition.inc
--vertical_results --vertical_results
@ -59,7 +47,7 @@ WHERE name LIKE 'thread/sql%';
SET GLOBAL event_scheduler = ON; SET GLOBAL event_scheduler = ON;
--source include/running_event_scheduler.inc --source include/pfs_running_event_scheduler.inc
# Show entries belonging to the just started event scheduler # Show entries belonging to the just started event scheduler
SELECT name, type, processlist_user, processlist_host, processlist_db, SELECT name, type, processlist_user, processlist_host, processlist_db,