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

MXS-1156: MASTER_CONNECT_RETRY is a new option for CHANGE MASTER TO

Browse Source 
MXS-1156: MASTER_CONNECT_RETRY is a new option for CHANGE MASTER TO.

The ‘connect_retry’, ‘master_retry_count’ options are now in use for
both service and
router_options.
This commit is contained in:
MassimilianoPinto
2017-08-30 16:45:16 +02:00
parent 42833386f5
commit e1efb91ea5
4 changed files with 173 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2923,8 +2923,6 @@ static void blr_register_cache_response(ROUTER_INSTANCE *router,
*/
static void blr_start_master_registration(ROUTER_INSTANCE *router, GWBUF *buf)
{
char task_name[BLRM_TASK_NAME_LEN + 1] = "";
switch (router->master_state)
{
case BLRM_TIMESTAMP:
@ -3232,6 +3230,7 @@ static void blr_start_master_registration(ROUTER_INSTANCE *router, GWBUF *buf)
*/
if (router->heartbeat > 0)
{
char task_name[BLRM_TASK_NAME_LEN + 1] = "";
snprintf(task_name,
BLRM_TASK_NAME_LEN,
"%s heartbeat",