mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
Bug#25422 (Hang with log tables)
Bug 17876 (Truncating mysql.slow_log in a SP after using cursor locks the
thread)
Bug 23044 (Warnings on flush of a log table)
Bug 29129 (Resetting general_log while the GLOBAL READ LOCK is set causes
a deadlock)
Prior to this fix, the server would hang when performing concurrent
ALTER TABLE or TRUNCATE TABLE statements against the LOG TABLES,
which are mysql.general_log and mysql.slow_log.
The root cause traces to the following code:
in sql_base.cc, open_table()
if (table->in_use != thd)
{
/* wait_for_condition will unlock LOCK_open for us */
wait_for_condition(thd, &LOCK_open, &COND_refresh);
}
The problem with this code is that the current implementation of the
LOGGER creates 'fake' THD objects, like
- Log_to_csv_event_handler::general_log_thd
- Log_to_csv_event_handler::slow_log_thd
which are not associated to a real thread running in the server,
so that waiting for these non-existing threads to release table locks
cause the dead lock.
In general, the design of Log_to_csv_event_handler does not fit into the
general architecture of the server, so that the concept of general_log_thd
and slow_log_thd has to be abandoned:
- this implementation does not work with table locking
- it will not work with commands like SHOW PROCESSLIST
- having the log tables always opened does not integrate well with DDL
operations / FLUSH TABLES / SET GLOBAL READ_ONLY
With this patch, the fundamental design of the LOGGER has been changed to:
- always open and close a log table when writing a log
- remove totally the usage of fake THD objects
- clarify how locking of log tables is implemented in general.
See WL#3984 for details related to the new locking design.
Additional changes (misc bugs exposed and fixed):
1)
mysqldump which would ignore some tables in dump_all_tables_in_db(),
but forget to ignore the same in dump_all_views_in_db().
2)
mysqldump would also issue an empty "LOCK TABLE" command when all the tables
to lock are to be ignored (numrows == 0), instead of not issuing the query.
3)
Internal errors handlers could intercept errors but not warnings
(see sql_error.cc).
4)
Implementing a nested call to open tables, for the performance schema tables,
exposed an existing bug in remove_table_from_cache(), which would perform:
in_use->some_tables_deleted=1;
against another thread, without any consideration about thread locking.
This call inside remove_table_from_cache() was not required anyway,
since calling mysql_lock_abort() takes care of aborting -- cleanly -- threads
that might hold a lock on a table.
This line (in_use->some_tables_deleted=1) has been removed.
sql/handler.cc:
Moved logic for system / log tables in the SQL layer.
sql/handler.h:
Moved logic for system / log tables in the SQL layer.
sql/lock.cc:
Revised locking of log tables
sql/log.cc:
Major cleanup: changed how log tables are locked / written to.
sql/log.h:
Major cleanup: changed how log tables are locked / written to.
sql/mysql_priv.h:
performance schema helpers
sql/slave.cc:
open_ltable() lock flags
sql/sp.cc:
open_ltable() lock flags
sql/sql_acl.cc:
open_ltable() lock flags
sql/sql_class.h:
performance schema helpers
sql/sql_delete.cc:
log tables cleanup in TRUNCATE
sql/sql_error.cc:
Internal handlers can also intercept warnings
sql/sql_insert.cc:
open_ltable() lock flags
sql/sql_parse.cc:
performance schema helpers
sql/sql_plugin.cc:
open_ltable() lock flags
sql/sql_rename.cc:
log tables cleanup in RENAME
sql/sql_servers.cc:
open_ltable() lock flags
sql/sql_show.cc:
Move INFORMATION_SCHEMA_NAME to table.cc
sql/sql_table.cc:
log tables cleanup (admin operations, ALTER TABLE)
sql/sql_udf.cc:
open_ltable() lock flags
sql/table.cc:
Implemented TABLE_CATEGORY.
sql/share/errmsg.txt:
Changed the wording and name of ER_CANT_READ_LOCK_LOG_TABLE
sql/table.h:
Implemented TABLE_CATEGORY.
storage/csv/ha_tina.cc:
Moved logic for system / log tables in the SQL layer.
storage/csv/ha_tina.h:
Moved logic for system / log tables in the SQL layer.
storage/myisam/ha_myisam.cc:
Moved logic for system / log tables in the SQL layer.
storage/myisam/ha_myisam.h:
Moved logic for system / log tables in the SQL layer.
client/mysqldump.c:
Don't lock tables in the ignore list.
Don't issue empty LOCK TABLES queries.
sql/sql_base.cc:
log tables cleanup
performance schema helpers
mysql-test/r/ps.result:
Adjust test results
mysql-test/r/show_check.result:
Adjust test results
mysql-test/r/status.result:
Adjust test results
mysql-test/t/log_state.test:
Added tests for Bug#29129
mysql-test/t/ps.test:
Make the test output deterministic
mysql-test/t/show_check.test:
Make the test output deterministic
mysql-test/r/log_state.result:
Changed the default location of the log output to LOG_FILE,
for backward compatibility with MySQL 5.0
---
Adjust test results
mysql-test/r/log_tables.result:
cleanup for -ps-protocol
mysql-test/t/log_tables.test:
cleanup for -ps-protocol
sql/set_var.cc:
Changed the default location of the log output to LOG_FILE,
for backward compatibility with MySQL 5.0
---
log tables cleanup
This commit is contained in:
parent
b0fcdce317
commit
4462578a1c
39 changed files with 1490 additions and 993 deletions
120
sql/table.h
120
sql/table.h
|
|
@ -140,6 +140,100 @@ class Field_timestamp;
|
|||
class Field_blob;
|
||||
class Table_triggers_list;
|
||||
|
||||
/**
|
||||
Category of table found in the table share.
|
||||
*/
|
||||
enum enum_table_category
|
||||
{
|
||||
/**
|
||||
Unknown value.
|
||||
*/
|
||||
TABLE_UNKNOWN_CATEGORY=0,
|
||||
|
||||
/**
|
||||
Temporary table.
|
||||
The table is visible only in the session.
|
||||
Therefore,
|
||||
- FLUSH TABLES WITH READ LOCK
|
||||
- SET GLOBAL READ_ONLY = ON
|
||||
do not apply to this table.
|
||||
Note that LOCK TABLE <t> FOR READ/WRITE
|
||||
can be used on temporary tables.
|
||||
Temporary tables are not part of the table cache.
|
||||
*/
|
||||
TABLE_CATEGORY_TEMPORARY=1,
|
||||
|
||||
/**
|
||||
User table.
|
||||
These tables do honor:
|
||||
- LOCK TABLE <t> FOR READ/WRITE
|
||||
- FLUSH TABLES WITH READ LOCK
|
||||
- SET GLOBAL READ_ONLY = ON
|
||||
User tables are cached in the table cache.
|
||||
*/
|
||||
TABLE_CATEGORY_USER=2,
|
||||
|
||||
/**
|
||||
System table, maintained by the server.
|
||||
These tables do honor:
|
||||
- LOCK TABLE <t> FOR READ/WRITE
|
||||
- FLUSH TABLES WITH READ LOCK
|
||||
- SET GLOBAL READ_ONLY = ON
|
||||
Typically, writes to system tables are performed by
|
||||
the server implementation, not explicitly be a user.
|
||||
System tables are cached in the table cache.
|
||||
*/
|
||||
TABLE_CATEGORY_SYSTEM=3,
|
||||
|
||||
/**
|
||||
Information schema tables.
|
||||
These tables are an interface provided by the system
|
||||
to inspect the system metadata.
|
||||
These tables do *not* honor:
|
||||
- LOCK TABLE <t> FOR READ/WRITE
|
||||
- FLUSH TABLES WITH READ LOCK
|
||||
- SET GLOBAL READ_ONLY = ON
|
||||
as there is no point in locking explicitely
|
||||
an INFORMATION_SCHEMA table.
|
||||
Nothing is directly written to information schema tables.
|
||||
Note that this value is not used currently,
|
||||
since information schema tables are not shared,
|
||||
but implemented as session specific temporary tables.
|
||||
*/
|
||||
/*
|
||||
TODO: Fixing the performance issues of I_S will lead
|
||||
to I_S tables in the table cache, which should use
|
||||
this table type.
|
||||
*/
|
||||
TABLE_CATEGORY_INFORMATION=4,
|
||||
|
||||
/**
|
||||
Performance schema tables.
|
||||
These tables are an interface provided by the system
|
||||
to inspect the system performance data.
|
||||
These tables do *not* honor:
|
||||
- LOCK TABLE <t> FOR READ/WRITE
|
||||
- FLUSH TABLES WITH READ LOCK
|
||||
- SET GLOBAL READ_ONLY = ON
|
||||
as there is no point in locking explicitely
|
||||
a PERFORMANCE_SCHEMA table.
|
||||
An example of PERFORMANCE_SCHEMA tables are:
|
||||
- mysql.slow_log
|
||||
- mysql.general_log,
|
||||
which *are* updated even when there is either
|
||||
a GLOBAL READ LOCK or a GLOBAL READ_ONLY in effect.
|
||||
User queries do not write directly to these tables
|
||||
(there are exceptions for log tables).
|
||||
The server implementation perform writes.
|
||||
Performance tables are cached in the table cache.
|
||||
*/
|
||||
TABLE_CATEGORY_PERFORMANCE=5
|
||||
};
|
||||
typedef enum enum_table_category TABLE_CATEGORY;
|
||||
|
||||
TABLE_CATEGORY get_table_category(const LEX_STRING *db,
|
||||
const LEX_STRING *name);
|
||||
|
||||
/*
|
||||
This structure is shared between different table objects. There is one
|
||||
instance of table share per one table in the database.
|
||||
|
|
@ -148,6 +242,10 @@ class Table_triggers_list;
|
|||
typedef struct st_table_share
|
||||
{
|
||||
st_table_share() {} /* Remove gcc warning */
|
||||
|
||||
/** Category of this table. */
|
||||
TABLE_CATEGORY table_category;
|
||||
|
||||
/* hash of field names (contains pointers to elements of field array) */
|
||||
HASH name_hash; /* hash of field names */
|
||||
MEM_ROOT mem_root;
|
||||
|
|
@ -259,18 +357,6 @@ typedef struct st_table_share
|
|||
*/
|
||||
int cached_row_logging_check;
|
||||
|
||||
/*
|
||||
TRUE if this is a system table like 'mysql.proc', which we want to be
|
||||
able to open and lock even when we already have some tables open and
|
||||
locked. To avoid deadlocks we have to put certain restrictions on
|
||||
locking of this table for writing. FALSE - otherwise.
|
||||
*/
|
||||
bool system_table;
|
||||
/*
|
||||
This flag is set for the log tables. Used during FLUSH instances to skip
|
||||
log tables, while closing tables (since logs must be always available)
|
||||
*/
|
||||
bool log_table;
|
||||
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
||||
bool auto_partitioned;
|
||||
const char *partition_info;
|
||||
|
|
@ -334,6 +420,16 @@ typedef struct st_table_share
|
|||
set_table_cache_key(key_buff, key_length);
|
||||
}
|
||||
|
||||
inline bool honor_global_locks()
|
||||
{
|
||||
return ((table_category == TABLE_CATEGORY_USER)
|
||||
|| (table_category == TABLE_CATEGORY_SYSTEM));
|
||||
}
|
||||
|
||||
inline bool require_write_privileges()
|
||||
{
|
||||
return (table_category == TABLE_CATEGORY_PERFORMANCE);
|
||||
}
|
||||
} TABLE_SHARE;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue