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

10.2 follow-up to MDEV-13039 innodb_fast_shutdown=0 crash due premature purge shutdown before fts_optimize_shutdown()

Browse Source 
srv_start_state_t: Document the flags. Replace SRV_START_STATE_STAT
with SRV_START_STATE_REDO. The srv_bg_undo_sources replaces the
original use of SRV_START_STATE_STAT.

dict_stats_thread_started, buf_dump_thread_started,
buf_flush_page_cleaner_thread_started: Remove (unused).

srv_shutdown_all_bg_threads(): Always wait for the I/O threads
to exit, also in read-only mode.

os_thread_free(): Remove.
This commit is contained in:
Marko Mäkelä 2017-06-08 15:43:06 +03:00
parent a78476d342
commit 35248fed10
6 changed files with 91 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/suite/innodb/r/row_format_redundant.result
View File

@ -1,3 +1,7 @@
#
# Bug#21644827 - FTS, ASSERT !SRV_READ_ONLY_MODE || M_IMPL.M_LOG_MODE ==
# MTR_LOG_NO_REDO
#
create table t1 (a int not null, d varchar(15) not null, b
varchar(198) not null, c char(156),
fulltext ftsic(c)) engine=InnoDB
@ -45,4 +49,26 @@ ERROR HY000: Table 't3' is read only
TRUNCATE TABLE t1;
TRUNCATE TABLE t2;
TRUNCATE TABLE t3;
DROP TABLE t1,t2,t3;
TRUNCATE TABLE t1;
ERROR 42S02: Table 'test.t1' doesn't exist in engine
TRUNCATE TABLE t2;
TRUNCATE TABLE t3;
SELECT COUNT(*) FROM t1;
ERROR 42S02: Table 'test.t1' doesn't exist in engine
SELECT COUNT(*) FROM t2;
COUNT(*)
0
SELECT COUNT(*) FROM t3;
COUNT(*)
0
RENAME TABLE t1 TO tee_one;
ERROR HY000: Error on rename of './test/t1' to './test/tee_one' (errno: 155 "The table does not exist in engine")
DROP TABLE t1;
Warnings:
Warning 1932 Table 'test.t1' doesn't exist in engine
NOT FOUND /\[ERROR\] InnoDB: Table `test`\.`t1` in InnoDB data dictionary contains invalid flags. SYS_TABLES.MIX_LEN=255;/ in mysqld.1.err
FOUND 48 /\[ERROR\] InnoDB: InnoDB: Error: table unused flags are:255/ in mysqld.1.err
FOUND 1 /\[Warning\] InnoDB: Parent table of FTS auxiliary table test/FTS_.* not found\./ in mysqld.1.err
NOT FOUND /"\[Warning\] InnoDB: Cannot open table test/t1 from the internal data dictionary of InnoDB though the \.frm file for the table exists.";/ in mysqld.1.err
FOUND 2 /\[ERROR\] InnoDB: Table `test`.`t1` does not exist in the InnoDB internal data dictionary though MariaDB is trying to (drop|rename)/ in mysqld.1.err
DROP TABLE t2,t3;

53
mysql-test/suite/innodb/t/row_format_redundant.test
View File

@ -1,16 +1,12 @@
--source include/innodb_page_size.inc
--source include/have_debug.inc
# Embedded mode doesn't allow restarting
--source include/not_embedded.inc
# MDEV-13059 XtraDB hangs on Windows due to failing to release
# block->lock X-latch in innodb_read_only mode
if (`SELECT count(*) FROM information_schema.plugins WHERE
plugin_name = 'innodb' AND plugin_status = 'active' AND
plugin_description LIKE '%xtradb%'`){
if (`SELECT @@version_compile_os IN ('Win32','Win64','Windows')`) {
skip MDEV-13059 XtraDB hangs on Windows in innodb_read_only mode;
}
}
--echo #
--echo # Bug#21644827 - FTS, ASSERT !SRV_READ_ONLY_MODE || M_IMPL.M_LOG_MODE ==
--echo # MTR_LOG_NO_REDO
--echo #
create table t1 (a int not null, d varchar(15) not null, b
varchar(198) not null, c char(156),
@ -70,6 +66,41 @@ TRUNCATE TABLE t1;
TRUNCATE TABLE t2;
TRUNCATE TABLE t3;
# TODO: Shutdown, corrupt the SYS_TABLES.TYPE of the tables, restart
--source include/shutdown_mysqld.inc
DROP TABLE t1,t2,t3;
# FIXME: Corrupt the SYS_TABLES.TYPE of the tables, do not use --debug
--let $restart_parameters = --debug=d,ib_table_invalid_flags
--source include/start_mysqld.inc
--error ER_NO_SUCH_TABLE_IN_ENGINE
TRUNCATE TABLE t1;
TRUNCATE TABLE t2;
TRUNCATE TABLE t3;
--error ER_NO_SUCH_TABLE_IN_ENGINE
SELECT COUNT(*) FROM t1;
SELECT COUNT(*) FROM t2;
SELECT COUNT(*) FROM t3;
--error ER_ERROR_ON_RENAME
RENAME TABLE t1 TO tee_one;
DROP TABLE t1;
--disable_query_log
call mtr.add_suppression("\\[ERROR\\] InnoDB: Table `test`\\.`t1` in InnoDB data dictionary contains invalid flags\\. SYS_TABLES\\.MIX_LEN=255");
call mtr.add_suppression("\\[ERROR\\] InnoDB: InnoDB: Error: table unused flags are:255");
call mtr.add_suppression("\\[Warning\\] InnoDB: Parent table of FTS auxiliary table test/FTS_.* not found\\.");
call mtr.add_suppression("\\[Warning\\] InnoDB: Cannot open table test/t1 from the internal data dictionary of InnoDB though the \\.frm file for the table exists.");
call mtr.add_suppression("\\[ERROR\\] InnoDB: Table `test`.`t1` does not exist in the InnoDB internal data dictionary though MariaDB is trying to (drop|rename)");
--enable_query_log
let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
--let SEARCH_PATTERN= \[ERROR\] InnoDB: Table `test`\.`t1` in InnoDB data dictionary contains invalid flags. SYS_TABLES.MIX_LEN=255;
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= \[ERROR\] InnoDB: InnoDB: Error: table unused flags are:255
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= \[Warning\] InnoDB: Parent table of FTS auxiliary table test/FTS_.* not found\.
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= "\\[Warning\\] InnoDB: Cannot open table test/t1 from the internal data dictionary of InnoDB though the \.frm file for the table exists.";
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN= \[ERROR\] InnoDB: Table `test`.`t1` does not exist in the InnoDB internal data dictionary though MariaDB is trying to (drop|rename)
--source include/search_pattern_in_file.inc
DROP TABLE t2,t3;

5
storage/innobase/include/os0thread.h
View File

@ -151,11 +151,6 @@ os_thread_sleep(
/*============*/
ulint tm); /*!< in: time in microseconds */
/**
Frees OS thread management data structures. */
void
os_thread_free();
/*****************************************************************//**
Check if there are threads active.
@return true if the thread count > 0. */

3
storage/innobase/include/srv0start.h
View File

@ -49,8 +49,7 @@ innobase_start_or_create_for_mysql();
void
innodb_shutdown();
/****************************************************************//**
Shuts down background threads that can generate undo pages. */
/** Shut down background threads that can generate undo log. */
void
srv_shutdown_bg_undo_sources();

12
storage/innobase/os/os0thread.cc
View File

@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -254,14 +255,3 @@ os_thread_active()
return(my_atomic_loadlint(&os_thread_count) > 0);
}
/**
Frees OS thread management data structures. */
void
os_thread_free()
{
if (ulint count = my_atomic_loadlint(&os_thread_count)) {
ib::warn() << "Some (" << count << ") threads are"
" still active";
}
}

49
storage/innobase/srv/srv0start.cc
View File

@ -153,15 +153,23 @@ UNIV_INTERN uint srv_sys_space_size_debug;
determine which threads need to be stopped if we need to abort during
the initialisation step. */
enum srv_start_state_t {
/** No thread started */
SRV_START_STATE_NONE = 0, /*!< No thread started */
/** lock_wait_timeout_thread started */
SRV_START_STATE_LOCK_SYS = 1, /*!< Started lock-timeout
thread. */
SRV_START_STATE_IO = 2, /*!< Started IO threads */
SRV_START_STATE_MONITOR = 4, /*!< Started montior thread */
SRV_START_STATE_MASTER = 8, /*!< Started master threadd. */
SRV_START_STATE_PURGE = 16, /*!< Started purge thread(s) */
SRV_START_STATE_STAT = 32 /*!< Started bufdump + dict stat
and FTS optimize thread. */
/** buf_flush_page_cleaner_coordinator,
buf_flush_page_cleaner_worker started */
SRV_START_STATE_IO = 2,
/** srv_error_monitor_thread, srv_monitor_thread started */
SRV_START_STATE_MONITOR = 4,
/** srv_master_thread started */
SRV_START_STATE_MASTER = 8,
/** srv_purge_coordinator_thread, srv_worker_thread started */
SRV_START_STATE_PURGE = 16,
/** fil_crypt_thread, btr_defragment_thread started
(all background threads that can generate redo log but not undo log */
SRV_START_STATE_REDO = 32
};
/** Track server thrd starting phases */
@ -189,9 +197,6 @@ static os_thread_t buf_dump_thread_handle;
static os_thread_t dict_stats_thread_handle;
/** Status variables, is thread started ?*/
static bool thread_started[SRV_MAX_N_IO_THREADS + 6 + 32] = {false};
static bool buf_dump_thread_started = false;
static bool dict_stats_thread_started = false;
static bool buf_flush_page_cleaner_thread_started = false;
/** Name of srv_monitor_file */
static char* srv_monitor_file_name;
@ -1228,10 +1233,6 @@ srv_shutdown_all_bg_threads()
{
srv_shutdown_state = SRV_SHUTDOWN_EXIT_THREADS;
if (!srv_start_state) {
return;
}
/* All threads end up waiting for certain events. Put those events
to the signaled state. Then the threads will exit themselves after
os_event_wait(). */
@ -1841,7 +1842,6 @@ innobase_start_or_create_for_mysql()
recv_sys_create();
recv_sys_init(buf_pool_get_curr_size());
lock_sys_create(srv_lock_table_size);
srv_start_state_set(SRV_START_STATE_LOCK_SYS);
/* Create i/o-handler threads: */
@ -1860,8 +1860,6 @@ innobase_start_or_create_for_mysql()
os_thread_create(buf_flush_page_cleaner_coordinator,
NULL, NULL);
buf_flush_page_cleaner_thread_started = true;
for (i = 1; i < srv_n_page_cleaners; ++i) {
os_thread_create(buf_flush_page_cleaner_worker,
NULL, NULL);
@ -2559,7 +2557,8 @@ files_checked:
srv_monitor_thread,
NULL, thread_ids + 4 + SRV_MAX_N_IO_THREADS);
thread_started[4 + SRV_MAX_N_IO_THREADS] = true;
srv_start_state_set(SRV_START_STATE_MONITOR);
srv_start_state |= SRV_START_STATE_LOCK_SYS
| SRV_START_STATE_MONITOR;
}
/* Create the SYS_FOREIGN and SYS_FOREIGN_COLS system tables */
@ -2615,7 +2614,6 @@ files_checked:
srv_dict_stats_thread_active = true;
dict_stats_thread_handle = os_thread_create(
dict_stats_thread, NULL, NULL);
dict_stats_thread_started = true;
/* Create the thread that will optimize the FTS sub-system. */
fts_optimize_init();
@ -2703,7 +2701,6 @@ files_checked:
buf_dump_thread_handle=
os_thread_create(buf_dump_thread, NULL, NULL);
buf_dump_thread_started = true;
#ifdef WITH_WSREP
} else {
ib::warn() <<
@ -2735,7 +2732,7 @@ files_checked:
btr_defragment_thread_active = true;
os_thread_create(btr_defragment_thread, NULL, NULL);
srv_start_state_set(SRV_START_STATE_STAT);
srv_start_state |= SRV_START_STATE_REDO;
}
/* Create the buffer pool resize thread */
@ -2775,8 +2772,7 @@ srv_fts_close(void)
}
#endif
/****************************************************************//**
Shuts down background threads that can generate undo pages. */
/** Shut down background threads that can generate undo log. */
void
srv_shutdown_bg_undo_sources()
{
@ -2797,8 +2793,7 @@ void
innodb_shutdown()
{
ut_ad(!srv_running);
srv_shutdown_bg_undo_sources();
ut_ad(!srv_undo_sources);
/* 1. Flush the buffer pool to disk, write the current lsn to
the tablespace header(s), and copy all log data to archive.
@ -2851,7 +2846,7 @@ innodb_shutdown()
dict_stats_thread_deinit();
}
if (srv_start_state_is_set(SRV_START_STATE_STAT)) {
if (srv_start_state_is_set(SRV_START_STATE_REDO)) {
ut_ad(!srv_read_only_mode);
/* srv_shutdown_bg_undo_sources() already invoked
fts_optimize_shutdown(); dict_stats_shutdown(); */
@ -2924,10 +2919,6 @@ innodb_shutdown()
buf_pool_free(srv_buf_pool_instances);
}
/* 6. Free the thread management resoruces. */
os_thread_free();
/* 7. Free the synchronisation infrastructure. */
sync_check_close();
if (dict_foreign_err_file) {