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

MXS-936: add shutdown hooks

Browse Source 
First part: add shutdown hooks for routers.

Binlog is the first one with a  destroyInstance() routine
This commit is contained in:
MassimilianoPinto 2016-11-08 11:12:37 +01:00
parent 689366b6b7
commit de18f25cb8
12 changed files with 92 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/router.h
View File

@ -24,6 +24,7 @@
* 16/07/2013 Massimiliano Pinto Added router commands values
* 22/10/2013 Massimiliano Pinto Added router errorReply entry point
* 27/10/2015 Martin Brampton Add RCAP_TYPE_NO_RSESSION
* 08/11/2016 Massimiliano Pinto Add destroyInstance() entry point
*
*/
@ -82,6 +83,7 @@ typedef struct router_object
error_action_t action,
bool* succp);
uint64_t (*getCapabilities)(void);
void (*destroyInstance)(SERVICE *service);
} ROUTER_OBJECT;
/**

6
server/core/service.c
View File

@ -34,6 +34,7 @@
* 03/03/15 Massimiliano Pinto Added config_enable_feedback_task() call in serviceStartAll
* 19/06/15 Martin Brampton More meaningful names for temp variables
* 31/05/16 Martin Brampton Implement connection throttling
* 08/11/16 Massimiliano Pinto Added: service_shutdown() calls destroyInstance() hoosk for routers
*
* @endverbatim
*/
@ -1827,6 +1828,11 @@ void service_shutdown()
while (svc != NULL)
{
svc->svc_do_shutdown = true;
/* Call destroyInstance hook for routers */
if (svc->router->destroyInstance)
{
svc->router->destroyInstance(svc);
}
svc = svc->next;
}
spinlock_release(&service_spin);

3
server/modules/routing/avro/avro.c
View File

@ -105,7 +105,8 @@ static ROUTER_OBJECT MyObject =
diagnostics,
clientReply,
errorReply,
getCapabilities
getCapabilities,
NULL
};
static SPINLOCK instlock;

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

@ -50,6 +50,7 @@
* for connection error and authentication failure.
* 11/07/2016 Massimiliano Pinto Added SSL backend support
* 22/07/2016 Massimiliano Pinto Added semi_sync replication support
* 08/11/2016 Massimiliano Pinto Added destroyInstance()
*
* @endverbatim
*/
@ -108,6 +109,7 @@ static int blr_check_binlog(ROUTER_INSTANCE *router);
int blr_read_events_all_events(ROUTER_INSTANCE *router, int fix, int debug);
void blr_master_close(ROUTER_INSTANCE *);
void blr_free_ssl_data(ROUTER_INSTANCE *inst);
static void destroyInstance(SERVICE *service);
/** The module object definition */
static ROUTER_OBJECT MyObject =
@ -120,7 +122,8 @@ static ROUTER_OBJECT MyObject =
diagnostics,
clientReply,
errorReply,
getCapabilities
getCapabilities,
destroyInstance
};
static void stats_func(void *);
@ -2291,3 +2294,65 @@ blr_free_ssl_data(ROUTER_INSTANCE *inst)
inst->service->dbref->server->server_ssl = NULL;
}
}
/**
* destroy binlog server instance
*
* @param service The service this router instance belongs to
*/
static void
destroyInstance(SERVICE *service)
{
ROUTER_INSTANCE *inst = (ROUTER_INSTANCE *) service->router_instance;
MXS_DEBUG("Destroying instance of router %s for service %s",
service->routerModule, service->name);
/* Check whether master connection is active */
if (inst->master)
{
if (inst->master->fd != -1 && inst->master->state == DCB_STATE_POLLING)
{
blr_master_close(inst);
}
}
spinlock_acquire(&inst->lock);
if (inst->master_state != BLRM_UNCONFIGURED)
{
inst->master_state = BLRM_SLAVE_STOPPED;
}
if (inst->client)
{
if (inst->client->state == DCB_STATE_POLLING)
{
dcb_close(inst->client);
inst->client = NULL;
}
}
/* Discard the queued residual data */
while (inst->residual)
{
inst->residual = gwbuf_consume(inst->residual, GWBUF_LENGTH(inst->residual));
}
inst->residual = NULL;
MXS_NOTICE("%s is being stopped by MaxScale shudown. Disconnecting from master %s:%d, "
"read up to log %s, pos %lu, transaction safe pos %lu",
service->name,
service->dbref->server->name,
service->dbref->server->port,
inst->binlog_name, inst->current_pos, inst->binlog_position);
if (inst->trx_safe && inst->pending_transaction)
{
MXS_WARNING("%s stopped by shutdown: detected mid-transaction in binlog file %s, "
"pos %lu, incomplete transaction starts at pos %lu",
service->name, inst->binlog_name, inst->current_pos, inst->binlog_position);
}
spinlock_release(&inst->lock);
}

3
server/modules/routing/cli/cli.c
View File

@ -71,7 +71,8 @@ static ROUTER_OBJECT MyObject =
diagnostics,
NULL,
NULL,
getCapabilities
getCapabilities,
NULL
};
extern int execute_cmd(CLI_SESSION *cli);

3
server/modules/routing/debugcli/debugcli.c
View File

@ -70,7 +70,8 @@ static ROUTER_OBJECT MyObject =
diagnostics,
NULL,
NULL,
getCapabilities
getCapabilities,
NULL
};
extern int execute_cmd(CLI_SESSION *cli);

3
server/modules/routing/maxinfo/maxinfo.c
View File

@ -96,7 +96,8 @@ static ROUTER_OBJECT MyObject =
diagnostics,
NULL,
handleError,
getCapabilities
getCapabilities,
NULL
};
static SPINLOCK instlock;

3
server/modules/routing/readconnroute/readconnroute.c
View File

@ -125,7 +125,8 @@ static ROUTER_OBJECT MyObject =
diagnostics,
clientReply,
handleError,
getCapabilities
getCapabilities,
NULL
};
static bool rses_begin_locked_router_action(ROUTER_CLIENT_SES* rses);

3
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -101,7 +101,8 @@ static ROUTER_OBJECT MyObject =
diagnostics,
clientReply,
handleError,
getCapabilities
getCapabilities,
NULL
};
/*

3
server/modules/routing/schemarouter/schemarouter.c
View File

@ -113,7 +113,8 @@ static ROUTER_OBJECT MyObject =
diagnostic,
clientReply,
handleError,
getCapabilities
getCapabilities,
NULL
};
static bool rses_begin_locked_router_action(ROUTER_CLIENT_SES* rses);

3
server/modules/routing/testroute/testroute.c
View File

@ -50,7 +50,8 @@ static ROUTER_OBJECT MyObject =
diagnostic,
clientReply,
handleError,
getCapabilities
getCapabilities,
NULL
};
typedef struct

3
server/modules/routing/webserver/webserver.c
View File

@ -64,7 +64,8 @@ static ROUTER_OBJECT MyObject =
diagnostic,
NULL,
NULL,
getCapabilities
getCapabilities,
NULL
};