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

MXS-2011 Change return value of blr_check_connect_retry

Browse Source 
0 cannot be used to indicate failure as 0 will be the waiting
period if we switch to an alternative server.

Also fix some minor issues; failure to initialize all members
and inverted success-check.
This commit is contained in:
Johan Wikman
2018-09-03 10:10:03 +03:00
parent 9826458700
commit ae28f8189b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -163,7 +163,7 @@ static void blr_start_master(void* data)
/* Check whether master connection can be started */
int connect_retry;
if ((connect_retry = blr_check_connect_retry(router)) == 0)
if ((connect_retry = blr_check_connect_retry(router)) == -1)
{
/* Force stopped state */
router->master_state = BLRM_SLAVE_STOPPED;
@ -359,7 +359,7 @@ blr_restart_master(ROUTER_INSTANCE *router)
if (router->master_state < BLRM_BINLOGDUMP)
{
int connect_retry;
if ((connect_retry = blr_check_connect_retry(router)) == 0)
if ((connect_retry = blr_check_connect_retry(router)) == -1)
{
/* Force stopped state */
router->master_state = BLRM_SLAVE_STOPPED;
@ -3091,7 +3091,7 @@ static int blr_check_connect_retry(ROUTER_INSTANCE *router)
/* Stop reconnection to master */
if (router->retry_count >= router->retry_limit)
{
return 0;
return -1;
}
/* Return the interval for next reconnect */