mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 20:11:42 +01:00
f4781a7e4c
- Scheduler is either initialized at server start or never. Starting & stopping is now suspending & resuming. - The scheduler has clear OO interface - Now all calls to the scheduler are synchronous - GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc) - External API is encapsulated into class Events - Includes fixes for all comments of Kostja's review of 19.05.2005 Starting to merge into 5.1-release (5.1.10) and push BitKeeper/etc/ignore: Added libmysqld/event_scheduler.cc to the ignore list libmysqld/Makefile.am: executor -> scheduler mysql-test/r/events.result: update result mysql-test/r/events_bugs.result: update result mysql-test/r/events_logs_tests.result: update result mysql-test/r/events_microsec.result: update result mysql-test/r/events_scheduling.result: update result mysql-test/r/events_stress.result: update result mysql-test/t/disabled.def: enable these tests mysql-test/t/events.test: optimize the test a bit for speed, save some seconds runtime remove FULL from SHOW EVENTS mostly use I_S.EVENTS mysql-test/t/events_bugs.test: Skip irrelevant for the current design tests - all events are loaded on server startup. Change in mysql.event will be visible on next server start. Don't use numeric error codes. mysql-test/t/events_logs_tests.test: optimize the test a bit for speed mysql-test/t/events_microsec.test: Skip irrelevant for the current design tests - all events are loaded on server startup. Change in mysql.event will be visible on next server start. Don't use numeric error codes. mysql-test/t/events_scheduling.test: broader test mysql-test/t/events_stress.test: Rework the test to the new architecture of suspending/resuming. Use less events, no need for thousands, hundreds is still ok. sql/Makefile.am: executor -> scheduler sql/cmakelists.txt: executor -> scheduler sql/event.cc: - remove todo comments - remove unneded evex_queue abstraction functions - move events_init() and events_shutdown() from event_executor.cc to here - export db_create_event - remove evex_load_and_compile_event, part of class Event_scheduler - integrate the public interface found in event.h and used by sql_parse.cc to use the new class Event_scheduler. sql/event.h: - add COND_finished so if one thread kills a running event it waits on this - export callback event_timed_definer_equal, event_timed_identifier_equal(), event_timed_name_equal and event_timed_db_equal() to be used by Event_scheduler::drop_matching_events() - cleanup event.h - encapsulated all external interface into class Events sql/event_executor.cc: make it empty, will delete after that sql/event_priv.h: - more things in the private header - remove event queue abstraction functions. tightly bind to QUEUE - export privately db_drop_event, db_find_event, db_create_event() - made change_security_context() and restore_security_context() free functions sql/event_timed.cc: - fix calculation of time when ENDS is set (STARTS is always set) - during Event_timed::compile() set the right Security_ctx. Prevents a crash during Event_scheduler::load_events_from_db() - add Event_timed::kill_thread() - implement event_timed_*_equal() - made change_security_context() and restore_security_context() free functions. - Comments cleanups sql/lex.h: new word scheduler for SHOW SCHEDULER STATUS (available only debug builds) sql/log.cc: move these from event_scheduler.cc sql/mysql_priv.h: refactor kill_one_thread export sql_print_message_func and sql_print_message_handlers sql/mysqld.cc: In close_connections, called by kill_server() skip the main scheduler thread and use events_shutdown() for shutting down the scheduler, in the same manner it's done for RPL. Add a new value to --event-scheduler : 0 <- No scheduler available 1 <- Start with scheduler enabled 2 <- Start with scheduler suspended sql/repl_failsafe.cc: refactor thd::system_thread to be an enum sql/set_var.cc: move sys_var_event_executor::update() to set_var.cc executor -> scheduler use thd::sys_var_tmp sql/set_var.h: executor -> scheduler sql/share/errmsg.txt: 3 new error messages sql/sql_class.cc: refactor thd::system_thread to be an enum . more type-safety sql/sql_class.h: refactor thd::system_thread to be an enum . more type-safety sql/sql_db.cc: get the error from evex_drop_schema_events sql/sql_error.h: export warning_level_names sql/sql_lex.h: new command SHOW SCHEDULER STATUS, available only in debug build and for debug purposes. sql/sql_parse.cc: refactor kill_one_thread() -> does the *dirty* work, and sql_kill just the reporting. add handler for SQLCOM_SHOW_SCHEDULER_STATUS sql/sql_show.cc: fix verbosity handling (this will be obsoleted anyway by the fix for 17394). sql/sql_yacc.yy: remove FULL from SHOW EVENTS add SHOW SCHEDULER STATUS in debug builds sql/table.cc: Fix valgrind warning.
122 lines
3.7 KiB
Text
122 lines
3.7 KiB
Text
CREATE DATABASE IF NOT EXISTS events_test;
|
|
#
|
|
# DROP DATABASE test start (bug #16406)
|
|
#
|
|
CREATE DATABASE events_conn1_test2;
|
|
CREATE TABLE events_test.fill_it(test_name varchar(20), occur datetime);
|
|
CREATE USER event_user2@localhost;
|
|
CREATE DATABASE events_conn2_db;
|
|
GRANT ALL ON *.* TO event_user2@localhost;
|
|
CREATE USER event_user3@localhost;
|
|
CREATE DATABASE events_conn3_db;
|
|
GRANT ALL ON *.* TO event_user3@localhost;
|
|
connect (conn2,localhost,event_user2,,events_conn2_db);
|
|
--echo "In the second connection we create some events which won't be dropped till the end"
|
|
--disable_query_log
|
|
let $1= 100;
|
|
while ($1)
|
|
{
|
|
eval CREATE EVENT conn2_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn2_ev$1", NOW());
|
|
dec $1;
|
|
}
|
|
--enable_query_log
|
|
connect (conn3,localhost,event_user3,,events_conn3_db);
|
|
--echo "In the second connection we create some events which won't be dropped till the end"
|
|
--disable_query_log
|
|
let $1= 100;
|
|
while ($1)
|
|
{
|
|
eval CREATE EVENT conn3_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn3_ev$1", NOW());
|
|
dec $1;
|
|
}
|
|
--enable_query_log
|
|
connection default;
|
|
USE events_conn1_test2;
|
|
CREATE EVENT ev_drop1 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
|
|
CREATE EVENT ev_drop2 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
|
|
CREATE EVENT ev_drop3 ON SCHEDULE EVERY 10 MINUTE DISABLE DO SELECT 1;
|
|
USE events_test;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
DROP DATABASE events_conn1_test2;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
|
|
--echo "Now testing stability - dropping db -> events while they are running"
|
|
CREATE DATABASE events_conn1_test2;
|
|
USE events_conn1_test2;
|
|
--disable_query_log
|
|
let $1= 100;
|
|
while ($1)
|
|
{
|
|
eval CREATE EVENT conn1_round1_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round1_ev$1", NOW());
|
|
dec $1;
|
|
}
|
|
--enable_query_log
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
SET GLOBAL event_scheduler=1;
|
|
--sleep 6
|
|
DROP DATABASE events_conn1_test2;
|
|
|
|
SET GLOBAL event_scheduler=2;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
CREATE DATABASE events_conn1_test3;
|
|
USE events_conn1_test3;
|
|
--disable_query_log
|
|
let $1= 100;
|
|
while ($1)
|
|
{
|
|
eval CREATE EVENT conn1_round2_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round2_ev$1", NOW());
|
|
dec $1;
|
|
}
|
|
--enable_query_log
|
|
SET GLOBAL event_scheduler=1;
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test3';
|
|
CREATE DATABASE events_conn1_test4;
|
|
USE events_conn1_test4;
|
|
--disable_query_log
|
|
let $1= 100;
|
|
while ($1)
|
|
{
|
|
eval CREATE EVENT conn1_round3_ev$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round3_ev$1", NOW());
|
|
dec $1;
|
|
}
|
|
--enable_query_log
|
|
|
|
CREATE DATABASE events_conn1_test2;
|
|
USE events_conn1_test2;
|
|
--disable_query_log
|
|
let $1= 100;
|
|
while ($1)
|
|
{
|
|
eval CREATE EVENT ev_round4_drop$1 ON SCHEDULE EVERY 1 SECOND DO INSERT INTO events_test.fill_it VALUES("conn1_round4_ev$1", NOW());
|
|
dec $1;
|
|
}
|
|
--enable_query_log
|
|
SELECT COUNT(*) FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='events_conn1_test2';
|
|
--sleep 6
|
|
connection conn2;
|
|
--send
|
|
DROP DATABASE events_conn2_db;
|
|
connection conn3;
|
|
--send
|
|
DROP DATABASE events_conn3_db;
|
|
connection default;
|
|
--send
|
|
DROP DATABASE events_conn1_test2;
|
|
DROP DATABASE events_conn1_test3;
|
|
SET GLOBAL event_scheduler=2;
|
|
DROP DATABASE events_conn1_test4;
|
|
SET GLOBAL event_scheduler=1;
|
|
connection conn2;
|
|
reap;
|
|
disconnect conn2;
|
|
connection conn3;
|
|
reap;
|
|
disconnect conn3;
|
|
connection default;
|
|
USE events_test;
|
|
DROP TABLE fill_it;
|
|
#
|
|
# DROP DATABASE test end (bug #16406)
|
|
#
|
|
DROP DATABASE events_test;
|