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

MXS-936: destroyInstance of binlog server is now updated

Browse Source 
MXS-936: destroyInstance of binlog server was not updated: not it takes
the ROUTER * parameter.
This commit is contained in:
MassimilianoPinto
2016-11-10 12:01:41 +01:00
parent e9030f71bd
commit 77946b6adc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/modules/routing/binlog/blr.c
View File

@ -109,7 +109,7 @@ static int blr_check_binlog(ROUTER_INSTANCE *router);
int blr_read_events_all_events(ROUTER_INSTANCE *router, int fix, int debug); int blr_read_events_all_events(ROUTER_INSTANCE *router, int fix, int debug);
void blr_master_close(ROUTER_INSTANCE *); void blr_master_close(ROUTER_INSTANCE *);
void blr_free_ssl_data(ROUTER_INSTANCE *inst); void blr_free_ssl_data(ROUTER_INSTANCE *inst);
static void destroyInstance(SERVICE *service); static void destroyInstance(ROUTER *instance);
/** The module object definition */ /** The module object definition */
static ROUTER_OBJECT MyObject = static ROUTER_OBJECT MyObject =
@ -2301,9 +2301,9 @@ blr_free_ssl_data(ROUTER_INSTANCE *inst)
* @param service The service this router instance belongs to * @param service The service this router instance belongs to
*/ */
static void static void
destroyInstance(SERVICE *service) destroyInstance(ROUTER *instance)
{ {
ROUTER_INSTANCE *inst = (ROUTER_INSTANCE *) service->router_instance; ROUTER_INSTANCE *inst = (ROUTER_INSTANCE *) instance;
MXS_DEBUG("Destroying instance of router %s for service %s", MXS_DEBUG("Destroying instance of router %s for service %s",
service->routerModule, service->name); service->routerModule, service->name);
@ -2340,18 +2340,18 @@ destroyInstance(SERVICE *service)
} }
inst->residual = NULL; inst->residual = NULL;
MXS_NOTICE("%s is being stopped by MaxScale shudown. Disconnecting from master %s:%d, " MXS_INFO("%s is being stopped by MaxScale shudown. Disconnecting from master %s:%d, "
"read up to log %s, pos %lu, transaction safe pos %lu", "read up to log %s, pos %lu, transaction safe pos %lu",
service->name, inst->service->name,
service->dbref->server->name, inst->service->dbref->server->name,
service->dbref->server->port, inst->service->dbref->server->port,
inst->binlog_name, inst->current_pos, inst->binlog_position); inst->binlog_name, inst->current_pos, inst->binlog_position);
if (inst->trx_safe && inst->pending_transaction) if (inst->trx_safe && inst->pending_transaction)
{ {
MXS_WARNING("%s stopped by shutdown: detected mid-transaction in binlog file %s, " MXS_WARNING("%s stopped by shutdown: detected mid-transaction in binlog file %s, "
"pos %lu, incomplete transaction starts at pos %lu", "pos %lu, incomplete transaction starts at pos %lu",
service->name, inst->binlog_name, inst->current_pos, inst->binlog_position); inst->service->name, inst->binlog_name, inst->current_pos, inst->binlog_position);
} }
spinlock_release(&inst->lock); spinlock_release(&inst->lock);