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

MDEV-5089 - possible deadlocks between rwlocks and mutexes

Browse Source 
Pre-MDL versions had direct relationship between LOCK_open and
LOCK_global_system_variables, e.g.:
  intern_sys_var_ptr // locks LOCK_global_system_variable
  mysql_sys_var_char
  create_options_are_valid
  ha_innobase::create
  handler::ha_create
  ha_create_table
  rea_create_table
  mysql_create_table_no_lock // locks LOCK_open
  mysql_create_table

With MDL this relationship was removed, but mutex order was still
recorded. In fact there is indirect relationship between LOCK_open
and LOCK_global_system_variables via rwlocks in reverse order.

Removed LOCK_open and LOCK_global_system_variables order recording,
instead assert that LOCK_open is never held in intern_sys_var_ptr().

This solves only one of many problems detected with MDEV-5089.
This commit is contained in:
Sergey Vojtovich 2014-02-13 11:40:49 +04:00
parent b0b699dc27
commit bde11c1ab5
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysqld.cc
View File

@ -5040,12 +5040,6 @@ int mysqld_main(int argc, char **argv)
unireg_abort(1); unireg_abort(1);
} }
/*
We must have LOCK_open before LOCK_global_system_variables because
LOCK_open is hold while sql_plugin.c::intern_sys_var_ptr() is called.
*/
mysql_mutex_record_order(&LOCK_open, &LOCK_global_system_variables);
create_shutdown_thread(); create_shutdown_thread();
start_handle_manager(); start_handle_manager();

1
sql/sql_plugin.cc
View File

@ -2900,6 +2900,7 @@ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock)
DBUG_ENTER("intern_sys_var_ptr"); DBUG_ENTER("intern_sys_var_ptr");
DBUG_ASSERT(offset >= 0); DBUG_ASSERT(offset >= 0);
DBUG_ASSERT((uint)offset <= global_system_variables.dynamic_variables_head); DBUG_ASSERT((uint)offset <= global_system_variables.dynamic_variables_head);
mysql_mutex_assert_not_owner(&LOCK_open);
if (!thd) if (!thd)
DBUG_RETURN((uchar*) global_system_variables.dynamic_variables_ptr + offset); DBUG_RETURN((uchar*) global_system_variables.dynamic_variables_ptr + offset);