hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a memory leak in all the monitors when a failed mysql_ping to the database caused a reinitialization of MYSQL* connection.

Browse Source
This commit is contained in:
Markus Makela
2015-05-07 11:42:14 +03:00
parent daf5b80a6f
commit fdd5a10478
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/galera_mon.c
View File

@ -377,6 +377,8 @@ char *server_string;
int read_timeout = handle->read_timeout; int read_timeout = handle->read_timeout;
int write_timeout = handle->write_timeout; int write_timeout = handle->write_timeout;
if(database->con)
mysql_close(database->con);
database->con = mysql_init(NULL); database->con = mysql_init(NULL);
rc = mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout); rc = mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout);

3
server/modules/monitor/mm_mon.c
View File

@ -360,7 +360,8 @@ char *server_string;
char *dpwd = decryptPassword(passwd); char *dpwd = decryptPassword(passwd);
int rc; int rc;
int read_timeout = 1; int read_timeout = 1;
if(database->con)
mysql_close(database->con);
database->con = mysql_init(NULL); database->con = mysql_init(NULL);
rc = mysql_options(database->con, MYSQL_OPT_READ_TIMEOUT, (void *)&read_timeout); rc = mysql_options(database->con, MYSQL_OPT_READ_TIMEOUT, (void *)&read_timeout);

3
server/modules/monitor/mysql_mon.c
View File

@ -401,7 +401,8 @@ char *server_string;
int connect_timeout = handle->connect_timeout; int connect_timeout = handle->connect_timeout;
int read_timeout = handle->read_timeout; int read_timeout = handle->read_timeout;
int write_timeout = handle->write_timeout; int write_timeout = handle->write_timeout;
if(database->con)
mysql_close(database->con);
database->con = mysql_init(NULL); database->con = mysql_init(NULL);
rc = mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout); rc = mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout);

2
server/modules/monitor/ndbcluster_mon.c
View File

@ -338,6 +338,8 @@ char *server_string;
int read_timeout = handle->read_timeout; int read_timeout = handle->read_timeout;
int write_timeout = handle->write_timeout; int write_timeout = handle->write_timeout;
if(database->con)
mysql_close(database->con);
database->con = mysql_init(NULL); database->con = mysql_init(NULL);
rc = mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout); rc = mysql_options(database->con, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&connect_timeout);