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

Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDS

Browse Source 
There was memory leak when running some tests on PB2.
The reason of the failure is an early return from change_master()
that was supposed to deallocate a dyn-array.

Fixed with relocating the dyn-array's destructor at ~LEX() that is
the end of the session, per Gleb's patch idea.
Two optimizations were done: the static buffer for the dyn-array to base on,
and the array initialization is called precisely when it's necessary rather than
per each CHANGE-MASTER as before.
This commit is contained in:
Andrei Elkin 2011-11-29 20:17:02 +02:00
parent bd49125dd9
commit 9937d5f0a9
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl/t/rpl_empty_master_host.test
View File

@ -17,6 +17,7 @@
# working when expected. # working when expected.
--source include/master-slave.inc --source include/master-slave.inc
--source include/have_binlog_format_mixed.inc
connection slave; connection slave;
STOP SLAVE; STOP SLAVE;

1
sql/sql_lex.cc
View File

@ -2352,6 +2352,7 @@ LEX::LEX()
INITIAL_LEX_PLUGIN_LIST_SIZE, INITIAL_LEX_PLUGIN_LIST_SIZE,
INITIAL_LEX_PLUGIN_LIST_SIZE); INITIAL_LEX_PLUGIN_LIST_SIZE);
reset_query_tables_list(TRUE); reset_query_tables_list(TRUE);
repl_ignore_server_ids_inited= false;
} }

7
sql/sql_lex.h
View File

@ -291,7 +291,9 @@ typedef struct st_lex_master_info
char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher; char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher;
char *relay_log_name; char *relay_log_name;
ulong relay_log_pos; ulong relay_log_pos;
bool repl_ignore_server_ids_inited;
DYNAMIC_ARRAY repl_ignore_server_ids; DYNAMIC_ARRAY repl_ignore_server_ids;
typeof(::server_id) repl_ignore_server_ids_static_buffer[4];
} LEX_MASTER_INFO; } LEX_MASTER_INFO;
typedef struct st_lex_reset_slave typedef struct st_lex_reset_slave
@ -2455,6 +2457,11 @@ struct LEX: public Query_tables_list
destroy_query_tables_list(); destroy_query_tables_list();
plugin_unlock_list(NULL, (plugin_ref *)plugins.buffer, plugins.elements); plugin_unlock_list(NULL, (plugin_ref *)plugins.buffer, plugins.elements);
delete_dynamic(&plugins); delete_dynamic(&plugins);
if (mi.repl_ignore_server_ids_inited)
{
delete_dynamic(&mi.repl_ignore_server_ids);
mi.repl_ignore_server_ids_inited= false;
}
} }
inline bool is_ps_or_view_context_analysis() inline bool is_ps_or_view_context_analysis()

1
sql/sql_repl.cc
View File

@ -1689,7 +1689,6 @@ err:
thd_proc_info(thd, 0); thd_proc_info(thd, 0);
if (ret == FALSE) if (ret == FALSE)
my_ok(thd); my_ok(thd);
delete_dynamic(&lex_mi->repl_ignore_server_ids); //freeing of parser-time alloc
DBUG_RETURN(ret); DBUG_RETURN(ret);
} }

14
sql/sql_yacc.yy
View File

@ -1863,12 +1863,7 @@ change:
LEX *lex = Lex; LEX *lex = Lex;
lex->sql_command = SQLCOM_CHANGE_MASTER; lex->sql_command = SQLCOM_CHANGE_MASTER;
bzero((char*) &lex->mi, sizeof(lex->mi)); bzero((char*) &lex->mi, sizeof(lex->mi));
/*
resetting flags that can left from the previous CHANGE MASTER
*/
lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED; lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED;
my_init_dynamic_array(&Lex->mi.repl_ignore_server_ids,
sizeof(::server_id), 16, 16);
} }
master_defs master_defs
{} {}
@ -1979,6 +1974,15 @@ ignore_server_id_list:
ignore_server_id: ignore_server_id:
ulong_num ulong_num
{ {
if (!Lex->mi.repl_ignore_server_ids_inited)
{
my_init_dynamic_array2(&Lex->mi.repl_ignore_server_ids,
sizeof(::server_id),
Lex->mi.repl_ignore_server_ids_static_buffer,
array_elements(Lex->mi.repl_ignore_server_ids_static_buffer),
16);
Lex->mi.repl_ignore_server_ids_inited= true;
}
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1)); insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
} }