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

TokuDB: Don't free P_S instrumented mutexes after exit()

Browse Source 
don't create static objects that destroy mutexes from destructors,
and don't destroy mutexes from .so destructor (on-unload) function.

if it happens after exit(), P_S will be long gone by that time

this fixes tokudb tests crashing on quantal-amd64
This commit is contained in:
Sergei Golubchik 2018-09-06 20:41:28 +02:00 committed by Oleksandr Byelkin
parent d527bf5390
commit 3a4242fd57
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/tokudb/PerconaFT/src/ydb_lib.cc
View File

@ -43,7 +43,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#include "ydb.h" #include "ydb.h"
#include <toku_assert.h> #include <toku_assert.h>
#if defined(__GNUC__) #if 0 && defined(__GNUC__)
static void __attribute__((constructor)) libtokuft_init(void) { static void __attribute__((constructor)) libtokuft_init(void) {
int r = toku_ydb_init(); int r = toku_ydb_init();

14
storage/tokudb/hatoku_hton.cc
View File

@ -25,14 +25,15 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved." #ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
#include "hatoku_hton.h" #include "hatoku_hton.h"
#include "PerconaFT/src/ydb.h"
#define TOKU_METADB_NAME "tokudb_meta" #define TOKU_METADB_NAME "tokudb_meta"
#if defined(HAVE_PSI_MUTEX_INTERFACE) #if defined(HAVE_PSI_MUTEX_INTERFACE)
static pfs_key_t tokudb_map_mutex_key; //static pfs_key_t tokudb_map_mutex_key;
static PSI_mutex_info all_tokudb_mutexes[] = { static PSI_mutex_info all_tokudb_mutexes[] = {
{&tokudb_map_mutex_key, "tokudb_map_mutex", 0}, //{&tokudb_map_mutex_key, "tokudb_map_mutex", 0},
{&ha_tokudb_mutex_key, "ha_tokudb_mutex", 0}, {&ha_tokudb_mutex_key, "ha_tokudb_mutex", 0},
}; };
@ -126,7 +127,7 @@ handlerton* tokudb_hton;
const char* ha_tokudb_ext = ".tokudb"; const char* ha_tokudb_ext = ".tokudb";
DB_ENV* db_env; DB_ENV* db_env;
static tokudb::thread::mutex_t tokudb_map_mutex; //static tokudb::thread::mutex_t tokudb_map_mutex;
#if defined(TOKU_THDVAR_MEMALLOC_BUG) && TOKU_THDVAR_MEMALLOC_BUG #if defined(TOKU_THDVAR_MEMALLOC_BUG) && TOKU_THDVAR_MEMALLOC_BUG
static TREE tokudb_map; static TREE tokudb_map;
struct tokudb_map_pair { struct tokudb_map_pair {
@ -280,7 +281,9 @@ static int tokudb_set_product_name(void) {
static int tokudb_init_func(void *p) { static int tokudb_init_func(void *p) {
TOKUDB_DBUG_ENTER("%p", p); TOKUDB_DBUG_ENTER("%p", p);
int r;
int r = toku_ydb_init();
assert(r==0);
// 3938: lock the handlerton's initialized status flag for writing // 3938: lock the handlerton's initialized status flag for writing
rwlock_t_lock_write(tokudb_hton_initialized_lock); rwlock_t_lock_write(tokudb_hton_initialized_lock);
@ -295,7 +298,7 @@ static int tokudb_init_func(void *p) {
count = array_elements(all_tokudb_rwlocks); count = array_elements(all_tokudb_rwlocks);
mysql_rwlock_register("tokudb", all_tokudb_rwlocks, count); mysql_rwlock_register("tokudb", all_tokudb_rwlocks, count);
tokudb_map_mutex.reinit(tokudb_map_mutex_key); //tokudb_map_mutex.reinit(tokudb_map_mutex_key);
#endif /* HAVE_PSI_INTERFACE */ #endif /* HAVE_PSI_INTERFACE */
db_env = NULL; db_env = NULL;
@ -682,6 +685,7 @@ static int tokudb_done_func(TOKUDB_UNUSED(void* p)) {
toku_global_status_variables = NULL; toku_global_status_variables = NULL;
tokudb::memory::free(toku_global_status_rows); tokudb::memory::free(toku_global_status_rows);
toku_global_status_rows = NULL; toku_global_status_rows = NULL;
toku_ydb_destroy();
TOKUDB_DBUG_RETURN(0); TOKUDB_DBUG_RETURN(0);
} }