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

Revert "MDEV-23536 : Race condition between KILL and transaction commit"

Browse Source 
This reverts the server part of the commit 775fccea0
but keeps InnoDB part (which reverted MDEV-17092 5530a93f4).

So after this both MDEV-23536 and MDEV-17092 are reverted,
and the original bug is resurrected.
This commit is contained in:
Sergei Golubchik 2021-01-11 13:16:38 +01:00
parent fdc4b7a6b2
commit 66f4900b51
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sql/sql_class.cc
View File

@ -1357,15 +1357,12 @@ void THD::change_user(void)
/* Do operations that may take a long time */ /* Do operations that may take a long time */
void THD::cleanup(bool have_mutex) void THD::cleanup(void)
{ {
DBUG_ENTER("THD::cleanup"); DBUG_ENTER("THD::cleanup");
DBUG_ASSERT(cleanup_done == 0); DBUG_ASSERT(cleanup_done == 0);
if (have_mutex) set_killed(KILL_CONNECTION);
set_killed_no_mutex(KILL_CONNECTION,0,0);
else
set_killed(KILL_CONNECTION);
#ifdef ENABLE_WHEN_BINLOG_WILL_BE_ABLE_TO_PREPARE #ifdef ENABLE_WHEN_BINLOG_WILL_BE_ABLE_TO_PREPARE
if (transaction.xid_state.xa_state == XA_PREPARED) if (transaction.xid_state.xa_state == XA_PREPARED)
{ {
@ -1440,28 +1437,6 @@ void THD::cleanup(bool have_mutex)
void THD::free_connection() void THD::free_connection()
{ {
DBUG_ASSERT(free_connection_done == 0); DBUG_ASSERT(free_connection_done == 0);
/* Check that we have already called thd->unlink() */
DBUG_ASSERT(prev == 0 && next == 0);
/*
Other threads may have a lock on THD::LOCK_thd_data or
THD::LOCK_thd_kill to ensure that this THD is not deleted
while they access it. The following mutex_lock ensures
that no one else is using this THD and it's now safe to
continue.
For example consider KILL-statement execution on
sql_parse.cc kill_one_thread() that will use
THD::LOCK_thd_data to protect victim thread during
THD::awake().
*/
mysql_mutex_lock(&LOCK_thd_data);
mysql_mutex_lock(&LOCK_thd_kill);
#ifdef WITH_WSREP
delete wsrep_rgi;
wsrep_rgi= 0;
#endif /* WITH_WSREP */
my_free(db); my_free(db);
db= NULL; db= NULL;
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
@ -1470,8 +1445,8 @@ void THD::free_connection()
net.vio= 0; net.vio= 0;
net_end(&net); net_end(&net);
#endif #endif
if (!cleanup_done) if (!cleanup_done)
cleanup(true); // We have locked THD::LOCK_thd_kill cleanup();
ha_close_connection(this); ha_close_connection(this);
plugin_thdvar_cleanup(this); plugin_thdvar_cleanup(this);
mysql_audit_free_thd(this); mysql_audit_free_thd(this);
@ -1482,8 +1457,6 @@ void THD::free_connection()
#if defined(ENABLED_PROFILING) #if defined(ENABLED_PROFILING)
profiling.restart(); // Reset profiling profiling.restart(); // Reset profiling
#endif #endif
mysql_mutex_unlock(&LOCK_thd_kill);
mysql_mutex_unlock(&LOCK_thd_data);
} }
/* /*
@ -1539,6 +1512,9 @@ THD::~THD()
mysql_mutex_lock(&LOCK_thd_data); mysql_mutex_lock(&LOCK_thd_data);
mysql_mutex_unlock(&LOCK_thd_data); mysql_mutex_unlock(&LOCK_thd_data);
#ifdef WITH_WSREP
delete wsrep_rgi;
#endif
if (!free_connection_done) if (!free_connection_done)
free_connection(); free_connection();

2
sql/sql_class.h
View File

@ -3194,7 +3194,7 @@ public:
void update_all_stats(); void update_all_stats();
void update_stats(void); void update_stats(void);
void change_user(void); void change_user(void);
void cleanup(bool have_mutex=false); void cleanup(void);
void cleanup_after_query(); void cleanup_after_query();
void free_connection(); void free_connection();
void reset_for_reuse(); void reset_for_reuse();