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

Close binlogrouter connections in thread 0

Browse Source 
The internal connections of the binlogrouter should be closed in the same
thread that created them. This should be the "main" thread, i.e. thread 0,
that starts the original binlogrouter service.
This commit is contained in:
Markus Mäkelä
2017-08-21 13:21:56 +03:00
parent 27a706341b
commit 655f8b9170
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1137,7 +1137,7 @@ createInstance(SERVICE *service, char **options)
}
/* Start replication from master server */
blr_start_master(inst);
blr_start_master_in_main(inst);
}
return (MXS_ROUTER *)inst;

2
server/modules/routing/binlogrouter/blr.h
View File

@ -946,7 +946,6 @@ static char *blrs_states[] =
/*
* Externals within the router
*/
extern void blr_start_master(void *);
extern void blr_master_response(ROUTER_INSTANCE *, GWBUF *);
extern void blr_master_reconnect(ROUTER_INSTANCE *);
extern int blr_master_connected(ROUTER_INSTANCE *);
@ -1018,6 +1017,7 @@ extern const char *blr_skip_leading_sql_comments(const char *);
extern bool blr_fetch_mariadb_gtid(ROUTER_SLAVE *,
const char *,
MARIADB_GTID_INFO *);
extern void blr_start_master_in_main(void* data);
MXS_END_DECLS

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

@ -146,7 +146,6 @@ static bool blr_handle_missing_files(ROUTER_INSTANCE *router,
char *new_file);
static void worker_cb_start_master(int worker_id, void* data);
static void blr_start_master_in_main(void* data);
extern bool blr_file_exists(ROUTER_INSTANCE *router);
extern void blr_file_update_gtid(ROUTER_INSTANCE *router);
@ -174,11 +173,16 @@ typedef enum
*
* @param router The router instance
*/
void
blr_start_master(void* data)
static void blr_start_master(void* data)
{
ROUTER_INSTANCE *router = (ROUTER_INSTANCE*)data;
DCB *client;
ss_dassert(mxs_worker_get_current_id() == 0);
if (router->client)
{
dcb_close(router->client);
router->client = NULL;
}
router->stats.n_binlogs_ses = 0;
spinlock_acquire(&router->lock);
@ -203,8 +207,10 @@ blr_start_master(void* data)
spinlock_release(&router->lock);
DCB* client = dcb_alloc(DCB_ROLE_INTERNAL, NULL);
/* Create fake 'client' DCB */
if ((client = dcb_alloc(DCB_ROLE_INTERNAL, NULL)) == NULL)
if (client == NULL)
{
MXS_ERROR("failed to create DCB for dummy client");
return;
@ -311,7 +317,7 @@ static void worker_cb_start_master(int worker_id, void* data)
*
* @param data Data intended for `blr_start_master`.
*/
static void blr_start_master_in_main(void* data)
void blr_start_master_in_main(void* data)
{
// The master should be connected to in the main worker, so we post it a
// message and call `blr_start_master` there.
@ -339,9 +345,6 @@ static void blr_start_master_in_main(void* data)
static void
blr_restart_master(ROUTER_INSTANCE *router)
{
dcb_close(router->client);
router->client = NULL;
/* Now it is safe to unleash other threads on this router instance */
spinlock_acquire(&router->lock);
router->reconnect_pending = 0;
@ -1776,6 +1779,7 @@ blr_stop_start_master(ROUTER_INSTANCE *router)
if (router->client->fd != -1 &&
router->client->state == DCB_STATE_POLLING)
{
// Is this dead code? dcb->fd for internal DCBs is always -1
dcb_close(router->client);
router->client = NULL;
}

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

@ -3494,6 +3494,7 @@ blr_stop_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
if (router->client->fd != -1 &&
router->client->state == DCB_STATE_POLLING)
{
// Is this dead code? dcb->fd for internal DCBs is always -1
dcb_close(router->client);
router->client = NULL;
}
@ -3712,7 +3713,7 @@ blr_start_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
}
/** Start replication from master */
blr_start_master(router);
blr_start_master_in_main(router);
MXS_NOTICE("%s: START SLAVE executed by %s@%s. Trying connection to master [%s]:%d, "
"binlog %s, pos %lu, transaction safe pos %lu",