database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix bug#53499 - purge thread is active during shutdown, assert buf/buf0buf.c line 4115.

Browse Source 
Check that all background threads are suspended or shutdown instead of just
checking for the master thread.
rb://333
This commit is contained in:
Sunny Bains
2010-05-10 13:17:17 +10:00
parent 5995b23864
commit 34860f74e4
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/innobase/include/srv0srv.h
View File

@ -639,12 +639,12 @@ srv_que_task_enqueue_low(
que_thr_t* thr); /*!< in: query thread */ que_thr_t* thr); /*!< in: query thread */
/**********************************************************************//** /**********************************************************************//**
Check whether the master thread is active. Check whether any background thread is active.
@return FALSE is it is not active. */ @return FALSE if all are are suspended or have exited. */
UNIV_INTERN UNIV_INTERN
ibool ibool
srv_is_master_thread_active(void); srv_is_any_background_thread_active(void);
/*==============================*/ /*======================================*/
/** Status variables to be passed to MySQL */ /** Status variables to be passed to MySQL */
struct export_var_struct{ struct export_var_struct{

14
storage/innobase/log/log0log.c
View File

@ -3133,9 +3133,9 @@ loop:
mutex_exit(&kernel_mutex); mutex_exit(&kernel_mutex);
/* Check that the master thread is suspended */ /* Check that the background threads are suspended */
if (srv_is_master_thread_active()) { if (srv_is_any_background_thread_active()) {
goto loop; goto loop;
} }
@ -3196,10 +3196,10 @@ loop:
mutex_exit(&(log_sys->mutex)); mutex_exit(&(log_sys->mutex));
/* Check that the master thread has stayed suspended */ /* Check that the background threads stay suspended */
if (srv_is_master_thread_active()) { if (srv_is_any_background_thread_active()) {
fprintf(stderr, fprintf(stderr,
"InnoDB: Warning: the master thread woke up" "InnoDB: Warning: some background thread woke up"
" during shutdown\n"); " during shutdown\n");
goto loop; goto loop;
@ -3221,7 +3221,7 @@ loop:
srv_shutdown_state = SRV_SHUTDOWN_LAST_PHASE; srv_shutdown_state = SRV_SHUTDOWN_LAST_PHASE;
/* Make some checks that the server really is quiet */ /* Make some checks that the server really is quiet */
ut_a(!srv_is_master_thread_active()); ut_a(!srv_is_any_background_thread_active());
ut_a(buf_all_freed()); ut_a(buf_all_freed());
ut_a(lsn == log_sys->lsn); ut_a(lsn == log_sys->lsn);
@ -3243,7 +3243,7 @@ loop:
fil_close_all_files(); fil_close_all_files();
/* Make some checks that the server really is quiet */ /* Make some checks that the server really is quiet */
ut_a(!srv_is_master_thread_active()); ut_a(!srv_is_any_background_thread_active());
ut_a(buf_all_freed()); ut_a(buf_all_freed());
ut_a(lsn == log_sys->lsn); ut_a(lsn == log_sys->lsn);

18
storage/innobase/srv/srv0srv.c
View File

@ -2559,18 +2559,24 @@ srv_inc_activity_count(void)
} }
/**********************************************************************//** /**********************************************************************//**
Check whether the master thread is active. Check whether any background thread is active.
@return FALSE is it is not active. */ @return FALSE if all are are suspended or have exited. */
UNIV_INTERN UNIV_INTERN
ibool ibool
srv_is_master_thread_active(void) srv_is_any_background_thread_active(void)
/*=============================*/ /*=====================================*/
{ {
ibool ret; ulint i;
ibool ret = FALSE;
srv_sys_mutex_enter(); srv_sys_mutex_enter();
ret = srv_sys->n_threads_active[SRV_MASTER] != 0; for (i = SRV_COM; i <= SRV_MASTER; ++i) {
if (srv_sys->n_threads_active[i] != 0) {
ret = TRUE;
break;
}
}
srv_sys_mutex_exit(); srv_sys_mutex_exit();