mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-13684 InnoDB race condition between fil_crypt_thread and btr_scrub_init

Browse source 
There is a race condition in InnoDB startup. A number of
fil_crypt_thread are created by fil_crypt_threads_init(). These threads
may call btr_scrub_complete_space() before btr_scrub_init() was called.
Those too early calls would be accessing an uninitialized scrub_stat_mutex.

innobase_start_or_create_for_mysql(): Invoke btr_scrub_init() before
fil_crypt_threads_init().

fil_crypt_complete_rotate_space(): Only invoke btr_scrub_complete_space()
if scrubbing is enabled. There is no need to update the statistics if
it is not enabled.
This commit is contained in:
Marko Mäkelä 2017-08-31 11:08:43 +03:00
parent 28b2896a43
commit 38ca9be4de
8 changed files with 24 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
storage/innobase/btr/btr0scrub.cc
View file

@ -886,17 +886,15 @@ btr_scrub_update_total_stat(btr_scrub_t *scrub_data)
memset(&scrub_data->scrub_stat, 0, sizeof(scrub_data->scrub_stat));
}
/**************************************************************//**
Complete iterating a space */
/** Complete iterating a space.
@param[in,out] scrub_data scrub data */
UNIV_INTERN
bool
btr_scrub_complete_space(
/*=====================*/
btr_scrub_t* scrub_data) /*!< in/out: scrub data */
void
btr_scrub_complete_space(btr_scrub_t* scrub_data)
{
ut_ad(scrub_data->scrubbing);
btr_scrub_table_close_for_thread(scrub_data);
btr_scrub_update_total_stat(scrub_data);
return scrub_data->scrubbing;
}
/*********************************************************************

3
storage/innobase/fil/fil0crypt.cc
View file

@ -2127,7 +2127,8 @@ fil_crypt_complete_rotate_space(
mutex_exit(&crypt_data->mutex);
/* all threads must call btr_scrub_complete_space wo/ mutex held */
if (btr_scrub_complete_space(&state->scrub_data) == true) {
if (state->scrub_data.scrubbing) {
btr_scrub_complete_space(&state->scrub_data);
if (should_flush) {
/* only last thread updates last_scrub_completed */
ut_ad(crypt_data);

11
storage/innobase/include/btr0scrub.h
View file

@ -154,13 +154,10 @@ btr_scrub_start_space(
ulint space, /*!< in: space */
btr_scrub_t* scrub_data); /*!< in/out: scrub data */
/****************************************************************
Complete iterating a space
* @return true if space was scrubbed */
/** Complete iterating a space.
@param[in,out] scrub_data scrub data */
UNIV_INTERN
bool
btr_scrub_complete_space(
/*=====================*/
btr_scrub_t* scrub_data); /*!< in/out: scrub data */
void
btr_scrub_complete_space(btr_scrub_t* scrub_data);
#endif

4
storage/innobase/srv/srv0start.cc
View file

@ -3030,12 +3030,10 @@ files_checked:
/* Create thread(s) that handles key rotation */
fil_system_enter();
btr_scrub_init();
fil_crypt_threads_init();
fil_system_exit();
/* Init data for datafile scrub threads */
btr_scrub_init();
/* Initialize online defragmentation. */
btr_defragment_init();
btr_defragment_thread_active = true;

12
storage/xtradb/btr/btr0scrub.cc
View file

@ -886,17 +886,15 @@ btr_scrub_update_total_stat(btr_scrub_t *scrub_data)
memset(&scrub_data->scrub_stat, 0, sizeof(scrub_data->scrub_stat));
}
/**************************************************************//**
Complete iterating a space */
/** Complete iterating a space.
@param[in,out] scrub_data scrub data */
UNIV_INTERN
bool
btr_scrub_complete_space(
/*=====================*/
btr_scrub_t* scrub_data) /*!< in/out: scrub data */
void
btr_scrub_complete_space(btr_scrub_t* scrub_data)
{
ut_ad(scrub_data->scrubbing);
btr_scrub_table_close_for_thread(scrub_data);
btr_scrub_update_total_stat(scrub_data);
return scrub_data->scrubbing;
}
/*********************************************************************

3
storage/xtradb/fil/fil0crypt.cc
View file

@ -2127,7 +2127,8 @@ fil_crypt_complete_rotate_space(
mutex_exit(&crypt_data->mutex);
/* all threads must call btr_scrub_complete_space wo/ mutex held */
if (btr_scrub_complete_space(&state->scrub_data) == true) {
if (state->scrub_data.scrubbing) {
btr_scrub_complete_space(&state->scrub_data);
if (should_flush) {
/* only last thread updates last_scrub_completed */
ut_ad(crypt_data);

11
storage/xtradb/include/btr0scrub.h
View file

@ -154,13 +154,10 @@ btr_scrub_start_space(
ulint space, /*!< in: space */
btr_scrub_t* scrub_data); /*!< in/out: scrub data */
/****************************************************************
Complete iterating a space
* @return true if space was scrubbed */
/** Complete iterating a space.
@param[in,out] scrub_data scrub data */
UNIV_INTERN
bool
btr_scrub_complete_space(
/*=====================*/
btr_scrub_t* scrub_data); /*!< in/out: scrub data */
void
btr_scrub_complete_space(btr_scrub_t* scrub_data);
#endif

4
storage/xtradb/srv/srv0start.cc
View file

@ -3146,12 +3146,10 @@ files_checked:
#endif /* WITH_WSREP */
/* Create thread(s) that handles key rotation */
fil_system_enter();
btr_scrub_init();
fil_crypt_threads_init();
fil_system_exit();
/* Init data for datafile scrub threads */
btr_scrub_init();
/* Initialize online defragmentation. */
btr_defragment_init();
btr_defragment_thread_active = true;