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

Connection retry limit minor changes

Browse Source 
Connection retry limit minor changes
This commit is contained in:
MassimilianoPinto
2017-09-01 13:52:40 +02:00
parent 9230420872
commit 85f395394b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,12 +228,6 @@ static void blr_start_master(void* data)
return; return;
} }
/* Increment retry counter */
if (router->master_state != BLRM_CONNECTING)
{
router->retry_count++;
}
/* Force connecting state */ /* Force connecting state */
router->master_state = BLRM_CONNECTING; router->master_state = BLRM_CONNECTING;
@ -274,6 +268,9 @@ static void blr_start_master(void* data)
router->session, router->session,
BLR_PROTOCOL)) == NULL) BLR_PROTOCOL)) == NULL)
{ {
spinlock_acquire(&router->lock);
router->retry_count++;
spinlock_release(&router->lock);
/* Set reconnection task */ /* Set reconnection task */
static const char master[] = "Master"; static const char master[] = "Master";
char *name = (char *)MXS_MALLOC(strlen(router->service->name) + sizeof(master)); char *name = (char *)MXS_MALLOC(strlen(router->service->name) + sizeof(master));
@ -439,6 +436,7 @@ blr_restart_master(ROUTER_INSTANCE *router)
/* Force unconnected state */ /* Force unconnected state */
router->master_state = BLRM_UNCONNECTED; router->master_state = BLRM_UNCONNECTED;
router->retry_count++;
spinlock_release(&router->lock); spinlock_release(&router->lock);
/* Set reconnection task */ /* Set reconnection task */