database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-26 07:02:12 +03:00
Code Activity

MDEV-8208: Sporadic SEGFAULT on startup

Browse Source 
Addendum:
* Before calling THD::init_for_queries(), flip the current_thd to wsrep
thread so that memory gets allocated for the right THD.
* Use wsrep_creating_startup_threads instead of plugins_are_initialized
as the condition for the execution of THD::init_for_queries() within
start_wsrep_THD(), as use of latter could still leave some room for
race.
This commit is contained in:
Nirbhay Choubey
2015-09-25 13:56:02 -04:00
parent d54bc3c0d1
commit 13615c5e18
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysys/my_alloc.c
View File

@ -93,6 +93,7 @@ void init_alloc_root(MEM_ROOT *mem_root, size_t block_size,
void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size, void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
size_t pre_alloc_size __attribute__((unused))) size_t pre_alloc_size __attribute__((unused)))
{ {
DBUG_ENTER("reset_root_defaults");
DBUG_ASSERT(alloc_root_inited(mem_root)); DBUG_ASSERT(alloc_root_inited(mem_root));
mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE; mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE;
@ -114,7 +115,7 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
{ {
/* We found a suitable block, no need to do anything else */ /* We found a suitable block, no need to do anything else */
mem_root->pre_alloc= mem; mem_root->pre_alloc= mem;
return; DBUG_VOID_RETURN;
} }
if (mem->left + ALIGN_SIZE(sizeof(USED_MEM)) == mem->size) if (mem->left + ALIGN_SIZE(sizeof(USED_MEM)) == mem->size)
{ {
@ -142,6 +143,8 @@ void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
else else
#endif #endif
mem_root->pre_alloc= 0; mem_root->pre_alloc= 0;
DBUG_VOID_RETURN;
} }

12
sql/mysqld.cc
View File

@ -4604,7 +4604,17 @@ a file name for --log-bin-index option", opt_binlog_index_name);
{ {
if (tmp->wsrep_applier == true) if (tmp->wsrep_applier == true)
{ {
/*
Set THR_THD to temporally point to this THD to register all the
variables that allocates memory for this THD.
*/
THD *current_thd_saved= current_thd;
my_pthread_setspecific_ptr(THR_THD, tmp);
tmp->init_for_queries(); tmp->init_for_queries();
/* Restore current_thd. */
my_pthread_setspecific_ptr(THR_THD, current_thd_saved);
} }
} }
mysql_mutex_unlock(&LOCK_thread_count); mysql_mutex_unlock(&LOCK_thread_count);
@ -4912,7 +4922,7 @@ pthread_handler_t start_wsrep_THD(void *arg)
thd->proc_info= 0; thd->proc_info= 0;
thd->command= COM_SLEEP; thd->command= COM_SLEEP;
if (plugins_are_initialized) if (wsrep_creating_startup_threads == 0)
{ {
thd->init_for_queries(); thd->init_for_queries();
} }