mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

References https://mariadb.atlassian.net/browse/MDEV-4136

Browse source 
Fixes to stop wsrep replicator when thread pool scheduler is in use
This commit is contained in:
Seppo Jaakola 2013-02-15 15:51:02 +02:00
parent 53f5ea2431
commit 2a6aa0a312
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sql/mysqld.cc
View file

@ -4853,6 +4853,14 @@ pthread_handler_t start_wsrep_THD(void *arg)
// 'Error in my_thread_global_end(): 2 threads didn't exit'
// at server shutdown
}
if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)
{
mysql_mutex_lock(&LOCK_thread_count);
delete thd;
thread_count--;
mysql_mutex_unlock(&LOCK_thread_count);
}
return(NULL);
}
@ -5175,7 +5183,14 @@ void wsrep_wait_appliers_close(THD *thd)
// This gotta be fixed in a more elegant manner if we gonna have arbitrary
// number of non-applier wsrep threads.
{
mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)
{
mysql_mutex_unlock(&LOCK_thread_count);
my_sleep(100);
mysql_mutex_lock(&LOCK_thread_count);
}
else
mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
DBUG_PRINT("quit",("One applier died (count=%u)",thread_count));
}
mysql_mutex_unlock(&LOCK_thread_count);
@ -5185,7 +5200,14 @@ void wsrep_wait_appliers_close(THD *thd)
mysql_mutex_lock(&LOCK_thread_count);
while (have_wsrep_appliers(thd) > 0)
{
mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)
{
mysql_mutex_unlock(&LOCK_thread_count);
my_sleep(100);
mysql_mutex_lock(&LOCK_thread_count);
}
else
mysql_cond_wait(&COND_thread_count,&LOCK_thread_count);
DBUG_PRINT("quit",("One thread died (count=%u)",thread_count));
}
mysql_mutex_unlock(&LOCK_thread_count);