Commit 4b60fbb5 authored by unknown's avatar unknown

BUG#27560: Memory usage of mysqld grows while doing nothing

  
The query-cache watch thread was continually allocating new thread entries on the
THD MEM_ROOT, not freed until server exit.
  
Fixed by using a simple array, auto-expanded as necessary.


sql/ha_ndbcluster.cc:
  Use a fixed array (auto-expanded as necessary) for temporary copy of open shares,
  don't keep pushing list entries on the THD mem root.
parent f216c398
...@@ -6677,7 +6677,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -6677,7 +6677,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
DBUG_RETURN(NULL); DBUG_RETURN(NULL);
} }
List<NDB_SHARE> util_open_tables; uint share_list_size= 0;
NDB_SHARE **share_list= NULL;
set_timespec(abstime, 0); set_timespec(abstime, 0);
for (;;) for (;;)
{ {
...@@ -6704,7 +6705,22 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -6704,7 +6705,22 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
/* Lock mutex and fill list with pointers to all open tables */ /* Lock mutex and fill list with pointers to all open tables */
NDB_SHARE *share; NDB_SHARE *share;
pthread_mutex_lock(&ndbcluster_mutex); pthread_mutex_lock(&ndbcluster_mutex);
for (uint i= 0; i < ndbcluster_open_tables.records; i++) uint i, record_count= ndbcluster_open_tables.records;
if (share_list_size < record_count)
{
NDB_SHARE ** new_share_list= new NDB_SHARE * [record_count];
if (!new_share_list)
{
sql_print_warning("ndb util thread: malloc failure, "
"query cache not maintained properly");
pthread_mutex_unlock(&ndbcluster_mutex);
goto next; // At least do not crash
}
delete [] share_list;
share_list_size= record_count;
share_list= new_share_list;
}
for (i= 0; i < record_count; i++)
{ {
share= (NDB_SHARE *)hash_element(&ndbcluster_open_tables, i); share= (NDB_SHARE *)hash_element(&ndbcluster_open_tables, i);
share->use_count++; /* Make sure the table can't be closed */ share->use_count++; /* Make sure the table can't be closed */
...@@ -6713,14 +6729,14 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -6713,14 +6729,14 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
i, share->table_name, share->use_count)); i, share->table_name, share->use_count));
/* Store pointer to table */ /* Store pointer to table */
util_open_tables.push_back(share); share_list[i]= share;
} }
pthread_mutex_unlock(&ndbcluster_mutex); pthread_mutex_unlock(&ndbcluster_mutex);
/* Iterate through the open files list */ /* Iterate through the open files list */
List_iterator_fast<NDB_SHARE> it(util_open_tables); for (i= 0; i < record_count; i++)
while ((share= it++))
{ {
share= share_list[i];
/* Split tab- and dbname */ /* Split tab- and dbname */
char buf[FN_REFLEN]; char buf[FN_REFLEN];
char *tabname, *db; char *tabname, *db;
...@@ -6767,10 +6783,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -6767,10 +6783,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
/* Decrease the use count and possibly free share */ /* Decrease the use count and possibly free share */
free_share(share); free_share(share);
} }
next:
/* Clear the list of open tables */
util_open_tables.empty();
/* Calculate new time to wake up */ /* Calculate new time to wake up */
int secs= 0; int secs= 0;
int msecs= ndb_cache_check_time; int msecs= ndb_cache_check_time;
...@@ -6793,6 +6806,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ...@@ -6793,6 +6806,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
} }
} }
if (share_list)
delete [] share_list;
thd->cleanup(); thd->cleanup();
delete thd; delete thd;
delete ndb; delete ndb;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment