Skip to content

Commit

Permalink
MDEV-11221 - main.events_restart failed in bb
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Sergey Vojtovich committed Mar 2, 2017
1 parent c1c5b7a commit 71f53bf
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
@@ -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
@@ -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 changes: 3 additions & 15 deletions mysql-test/suite/perfschema/t/threads_mysql.test
Expand Up @@ -9,22 +9,10 @@

# Ensure that the event scheduler (started via threads_mysql-master.opt)
# is really running.
--source include/running_event_scheduler.inc
--source include/pfs_running_event_scheduler.inc

SET GLOBAL event_scheduler = OFF;
--source include/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
--source include/pfs_no_running_event_scheduler.inc

--vertical_results

Expand Down Expand Up @@ -59,7 +47,7 @@ WHERE name LIKE 'thread/sql%';


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
SELECT name, type, processlist_user, processlist_host, processlist_db,
Expand Down

0 comments on commit 71f53bf

Please sign in to comment.