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

MXS-2046: Fix additional memory leaks

Browse Source 
A set of memory leaks were revealed by Valgrind.
This commit is contained in:
Markus Mäkelä
2018-09-13 13:56:19 +03:00
parent ce602daf10
commit bee7cc2002
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/binlogrouter/blr.c
View File

@ -1225,6 +1225,7 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)
slave->gtid_maps = NULL;
memset(&slave->f_info, 0, sizeof (MARIADB_GTID_INFO));
slave->annotate_rows = false;
slave->warning_msg = NULL;
/**
* Add this session to the list of active sessions.
@ -1312,6 +1313,7 @@ static void freeSession(MXS_ROUTER* router_instance,
{
MXS_FREE(slave->mariadb_gtid);
}
MXS_FREE(slave->warning_msg);
MXS_FREE(slave);
}
@ -1414,7 +1416,9 @@ routeQuery(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *queu
ROUTER_INSTANCE *router = (ROUTER_INSTANCE *)instance;
ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session;
return blr_slave_request(router, slave, queue);
int rc = blr_slave_request(router, slave, queue);
gwbuf_free(queue);
return rc;
}
static char *event_names[] =

4
server/modules/routing/binlogrouter/blr_file.c
View File

@ -1404,6 +1404,7 @@ blr_read_binlog(ROUTER_INSTANCE *router,
void
blr_close_binlog(ROUTER_INSTANCE *router, BLFILE *file)
{
ss_dassert(file);
spinlock_acquire(&router->fileslock);
file->refcnt--;
if (file->refcnt == 0)
@ -4055,6 +4056,7 @@ bool blr_save_mariadb_gtid(ROUTER_INSTANCE *inst)
{
if (sql_ret == SQLITE_CONSTRAINT)
{
sqlite3_free(errmsg);
/* Prepare UPDATE SQL */
snprintf(sql_stmt,
GTID_SQL_BUFFER_SIZE,
@ -4102,6 +4104,8 @@ bool blr_save_mariadb_gtid(ROUTER_INSTANCE *inst)
}
}
sqlite3_free(errmsg);
MXS_DEBUG("Saved/udated MariaDB GTID '%s', %s:%lu,%lu, SQL [%s]",
gtid_info.gtid,
inst->binlog_name,

21
server/modules/routing/binlogrouter/blr_master.c
View File

@ -153,6 +153,8 @@ static void blr_start_master(void* data)
if (router->client)
{
MXS_FREE(router->client->data);
router->client->data = NULL;
dcb_close(router->client);
router->client = NULL;
}
@ -655,6 +657,7 @@ blr_master_response(ROUTER_INSTANCE *router, GWBUF *buf)
router->active_logs = 0;
spinlock_release(&router->lock);
atomic_add(&router->handling_threads, -1);
gwbuf_free(buf);
}
/**
@ -2010,13 +2013,13 @@ blr_check_heartbeat(ROUTER_INSTANCE *router)
static void blr_log_identity(ROUTER_INSTANCE *router)
{
char *master_uuid;
char *master_hostname;
char *master_version;
char *master_uuid = NULL;
char *master_hostname = NULL;
char *master_version = NULL;
if (router->set_master_version)
{
master_version = router->set_master_version;
master_version = MXS_STRDUP(router->set_master_version);
}
else
{
@ -2025,16 +2028,16 @@ static void blr_log_identity(ROUTER_INSTANCE *router)
if (router->set_master_hostname)
{
master_hostname = router->set_master_hostname;
master_hostname = MXS_STRDUP(router->set_master_hostname);
}
else
{
master_hostname = blr_extract_column(router->saved_master.selecthostname, 1);
}
if (router->set_master_uuid)
if (router->set_master_uuid && router->master_uuid)
{
master_uuid = router->master_uuid;
master_uuid = MXS_STRDUP(router->master_uuid);
}
else
{
@ -2074,6 +2077,10 @@ static void blr_log_identity(ROUTER_INSTANCE *router)
(master_hostname == NULL ? "not available" : master_hostname),
(master_version == NULL ? "not available" : master_version));
}
MXS_FREE(master_version);
MXS_FREE(master_hostname);
MXS_FREE(master_uuid);
}
/**

13
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -417,7 +417,7 @@ blr_slave_request(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue)
{
MXS_ERROR("Invalid slave state machine state (%d) for binlog router.",
slave->state);
gwbuf_consume(queue, gwbuf_length(queue));
gwbuf_free(queue);
return 0;
}
@ -495,7 +495,6 @@ blr_slave_request(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue)
break;
}
gwbuf_free(queue);
return rv;
}
@ -2159,6 +2158,7 @@ blr_slave_binlog_dump(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue
blr_slave_abort_dump_request(slave, errmsg);
slave->state = BLRS_ERRORED;
dcb_close(slave->dcb);
gwbuf_free(fde);
return 1;
}
}
@ -2202,6 +2202,7 @@ blr_slave_binlog_dump(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue
blr_slave_abort_dump_request(slave, errmsg);
slave->state = BLRS_ERRORED;
dcb_close(slave->dcb);
gwbuf_free(fde);
return 1;
}
slave->lastEventReceived = MARIADB10_GTID_GTID_LIST_EVENT;
@ -2222,6 +2223,7 @@ blr_slave_binlog_dump(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, GWBUF *queue
/* Force the slave to call catchup routine */
poll_fake_write_event(slave->dcb);
gwbuf_free(fde);
return 1;
}
@ -2787,6 +2789,7 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large)
slave->stats.n_events - events_before,
router->current_safe_event,
read_errmsg);
hdr.ok = SLAVE_POS_READ_OK;
}
}
@ -3060,6 +3063,9 @@ blr_slave_catchup(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave, bool large)
* Fake rotate just written to client,
* no need to call poll_fake_write_event()
*/
// blr_slave_fake_rotate closes the file on success
file = NULL;
}
else
{
@ -6485,6 +6491,7 @@ blr_slave_read_ste(ROUTER_INSTANCE *router,
if (!new_encryption_ctx)
{
gwbuf_free(record);
return 0;
}
record_ptr += BINLOG_EVENT_HDR_LEN;
@ -6521,9 +6528,11 @@ blr_slave_read_ste(ROUTER_INSTANCE *router,
* Note: if the requested pos is equal to START_ENCRYPTION_EVENT pos
* the event will be skipped by blr_read_binlog() routine
*/
gwbuf_free(record);
return 1;
}
gwbuf_free(record);
return 0;
}