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

MDEV-9359: encryption.create_or_replace fails sporadically in buildbot: failing assertion: mutex->magic_n == MUTEX_MAGIC_N

Browse Source 
Make sure that encryption threads mutex is initialized before starting
encryption threads.
This commit is contained in:
Jan Lindström 2016-01-05 18:50:54 +02:00
parent 56e0de0411
commit 111acb721f
6 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
storage/innobase/fil/fil0crypt.cc
View File

@ -2294,6 +2294,10 @@ fil_crypt_set_thread_cnt(
/*=====================*/
uint new_cnt) /*!< in: New key rotation thread count */
{
if (!fil_crypt_threads_inited) {
fil_crypt_threads_init();
}
if (new_cnt > srv_n_fil_crypt_threads) {
uint add = new_cnt - srv_n_fil_crypt_threads;
srv_n_fil_crypt_threads = new_cnt;
@ -2358,15 +2362,18 @@ void
fil_crypt_threads_init()
/*====================*/
{
fil_crypt_event = os_event_create();
fil_crypt_threads_event = os_event_create();
mutex_create(fil_crypt_threads_mutex_key,
&fil_crypt_threads_mutex, SYNC_NO_ORDER_CHECK);
ut_ad(mutex_own(&fil_system->mutex));
if (!fil_crypt_threads_inited) {
fil_crypt_event = os_event_create();
fil_crypt_threads_event = os_event_create();
mutex_create(fil_crypt_threads_mutex_key,
&fil_crypt_threads_mutex, SYNC_NO_ORDER_CHECK);
uint cnt = srv_n_fil_crypt_threads;
srv_n_fil_crypt_threads = 0;
fil_crypt_set_thread_cnt(cnt);
fil_crypt_threads_inited = true;
uint cnt = srv_n_fil_crypt_threads;
srv_n_fil_crypt_threads = 0;
fil_crypt_threads_inited = true;
fil_crypt_set_thread_cnt(cnt);
}
}
/*********************************************************************
@ -2389,6 +2396,7 @@ fil_crypt_threads_cleanup()
{
os_event_free(fil_crypt_event);
os_event_free(fil_crypt_threads_event);
fil_crypt_threads_inited = false;
}
/*********************************************************************

2
storage/innobase/srv/srv0start.cc
View File

@ -2984,7 +2984,9 @@ files_checked:
fts_optimize_init();
/* Create thread(s) that handles key rotation */
fil_system_enter();
fil_crypt_threads_init();
fil_system_exit();
/* Create the log scrub thread */
if (srv_scrub_log)

8
storage/innobase/sync/sync0sync.cc
View File

@ -422,7 +422,13 @@ mutex_validate(
const ib_mutex_t* mutex) /*!< in: mutex */
{
ut_a(mutex);
ut_a(mutex->magic_n == MUTEX_MAGIC_N);
if (mutex->magic_n != MUTEX_MAGIC_N) {
ib_logf(IB_LOG_LEVEL_ERROR,
"Mutex %p not initialized file %s line %lu.",
mutex, mutex->cfile_name, mutex->cline);
}
ut_ad(mutex->magic_n == MUTEX_MAGIC_N);
return(TRUE);
}

24
storage/xtradb/fil/fil0crypt.cc
View File

@ -2294,6 +2294,10 @@ fil_crypt_set_thread_cnt(
/*=====================*/
uint new_cnt) /*!< in: New key rotation thread count */
{
if (!fil_crypt_threads_inited) {
fil_crypt_threads_init();
}
if (new_cnt > srv_n_fil_crypt_threads) {
uint add = new_cnt - srv_n_fil_crypt_threads;
srv_n_fil_crypt_threads = new_cnt;
@ -2358,15 +2362,18 @@ void
fil_crypt_threads_init()
/*====================*/
{
fil_crypt_event = os_event_create();
fil_crypt_threads_event = os_event_create();
mutex_create(fil_crypt_threads_mutex_key,
&fil_crypt_threads_mutex, SYNC_NO_ORDER_CHECK);
ut_ad(mutex_own(&fil_system->mutex));
if (!fil_crypt_threads_inited) {
fil_crypt_event = os_event_create();
fil_crypt_threads_event = os_event_create();
mutex_create(fil_crypt_threads_mutex_key,
&fil_crypt_threads_mutex, SYNC_NO_ORDER_CHECK);
uint cnt = srv_n_fil_crypt_threads;
srv_n_fil_crypt_threads = 0;
fil_crypt_set_thread_cnt(cnt);
fil_crypt_threads_inited = true;
uint cnt = srv_n_fil_crypt_threads;
srv_n_fil_crypt_threads = 0;
fil_crypt_threads_inited = true;
fil_crypt_set_thread_cnt(cnt);
}
}
/*********************************************************************
@ -2389,6 +2396,7 @@ fil_crypt_threads_cleanup()
{
os_event_free(fil_crypt_event);
os_event_free(fil_crypt_threads_event);
fil_crypt_threads_inited = false;
}
/*********************************************************************

2
storage/xtradb/srv/srv0start.cc
View File

@ -3076,7 +3076,9 @@ files_checked:
fts_optimize_init();
/* Create thread(s) that handles key rotation */
fil_system_enter();
fil_crypt_threads_init();
fil_system_exit();
/* Create the log scrub thread */
if (srv_scrub_log)

8
storage/xtradb/sync/sync0sync.cc
View File

@ -482,7 +482,13 @@ mutex_validate(
const ib_mutex_t* mutex) /*!< in: mutex */
{
ut_a(mutex);
ut_a(mutex->magic_n == MUTEX_MAGIC_N);
if (mutex->magic_n != MUTEX_MAGIC_N) {
ib_logf(IB_LOG_LEVEL_ERROR,
"Mutex %p not initialized file %s line %lu.",
mutex, mutex->cfile_name, mutex->cline);
}
ut_ad(mutex->magic_n == MUTEX_MAGIC_N);
return(TRUE);
}