Skip to content

Commit

Permalink
Revert "MDEV-12445 : Rocksdb does not shutdown worker threads and abo…
Browse files Browse the repository at this point in the history
…rts in memleak check on server shutdown"

This reverts commit 6f1f911.

because it doesn't do anything now (the server doesn't check
my_disable_leak_check) and it never did anything before
(because without `extern` it simply created a local instance of
my_disable_leak_check, did not affect server's my_disable_leak_check).
  • Loading branch information
vuvova committed May 27, 2020
1 parent 6af37ba commit cceb965
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
1 change: 0 additions & 1 deletion sql/mysqld.cc
Expand Up @@ -365,7 +365,6 @@ static bool volatile select_thread_in_use, signal_thread_in_use;
static volatile bool ready_to_exit;
static my_bool opt_debugging= 0, opt_external_locking= 0, opt_console= 0;
static my_bool opt_short_log_format= 0, opt_silent_startup= 0;
bool my_disable_leak_check= false;

uint kill_cached_threads;
static uint wake_thread;
Expand Down
8 changes: 0 additions & 8 deletions storage/rocksdb/ha_rocksdb.cc
Expand Up @@ -114,7 +114,6 @@ int thd_binlog_format(const MYSQL_THD thd);
bool thd_binlog_filter_ok(const MYSQL_THD thd);
}

MYSQL_PLUGIN_IMPORT bool my_disable_leak_check;
extern my_bool opt_core_file;

// Needed in rocksdb_init_func
Expand Down Expand Up @@ -5688,13 +5687,6 @@ static int rocksdb_init_func(void *const p) {
}
#endif

/**
Rocksdb does not always shutdown its threads, when
plugin is shut down. Disable server's leak check
at exit to avoid crash.
*/
my_disable_leak_check = true;

err = my_error_register(rdb_get_error_messages, HA_ERR_ROCKSDB_FIRST,
HA_ERR_ROCKSDB_LAST);
if (err != 0) {
Expand Down

0 comments on commit cceb965

Please sign in to comment.