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

The blr_master_close() is now called in the main worker thread.

Browse Source 
The blr_master_close() is now called in the main worker thread by:
blr_stop_slave() and blr_stop_start_master()
This commit is contained in:
MassimilianoPinto
2017-09-01 11:49:27 +02:00
parent 18cb61f7de
commit 9230420872
2 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,6 +355,8 @@ static void blr_log_config_changes(ROUTER_INSTANCE *router,
MASTER_SERVER_CFG *current_master,
CHANGE_MASTER_OPTIONS *change_master);
extern void blr_log_disabled_heartbeat(const ROUTER_INSTANCE *inst);
extern void blr_close_master_in_main(void* data);
/**
* Process a request packet from the slave server.
*
@ -3525,7 +3527,7 @@ blr_stop_slave(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
if (router->master->fd != -1 &&
router->master->state == DCB_STATE_POLLING)
{
blr_master_close(router);
blr_close_master_in_main(router);
}
}