diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-11-09 15:03:57 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-11-09 15:03:57 +0100 |
| commit | 7a28f61ded763f4778b5f595115a0b1fde2372a8 (patch) | |
| tree | 6e5c5e7b53df6a4f4893c646a593173201858777 /storage/xtradb/include/srv0srv.h | |
| parent | 7a80bf165b1907acbdccf8dd46681df365dd2156 (diff) | |
| download | mariadb-git-7a28f61ded763f4778b5f595115a0b1fde2372a8.tar.gz | |
MBug#643463: Slow XtraDB shutdown: Fix more sleeps delaying shutdown.
This patch removes most remaining delays due to uninteruptible sleep()
during shutdown, as found using PMP. This makes standard test run very
close in speed to with --loose-innodb-fast-shutdown=2, and greatly
speeds up running the test suite.
sql/mysqld.cc:
Poll for threads to die every 20 msec during shutdown, rather than force
a wait for 2 full seconds should one thread be a little slow to exit
(this was seen occasionally in mysql-test-run).
storage/xtradb/include/srv0srv.h:
Rename the event, as we now use it to wakeup more threads during shutdown.
storage/xtradb/log/log0log.c:
Rename the event, as we now use it to wakeup more threads during shutdown.
storage/xtradb/srv/srv0srv.c:
Replace some hardcoded sleep()s with os_wait_event_time() that can be
interrupted early during server shutdown to avoid unnecessary delays.
Diffstat (limited to 'storage/xtradb/include/srv0srv.h')
| -rw-r--r-- | storage/xtradb/include/srv0srv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h index 8c64d5cee71..f4c9704741c 100644 --- a/storage/xtradb/include/srv0srv.h +++ b/storage/xtradb/include/srv0srv.h @@ -57,8 +57,8 @@ extern const char srv_mysql50_table_name_prefix[9]; thread starts running */ extern os_event_t srv_lock_timeout_thread_event; -/* This event is set to tell the purge thread to shut down */ -extern os_event_t srv_purge_thread_event; +/* This event is set at shutdown to wakeup threads from sleep */ +extern os_event_t srv_shutdown_event; /* If the last data file is auto-extended, we add this many pages to it at a time */ |