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

Binlog server: force fake Client DCB close in errorReply

Browse Source 
Binlog server: force fake Client DCB close in errorReply. This fixes an
issue when START SLAVE, with new config, is called after a previous one
with errors.
This commit is contained in:
MassimilianoPinto
2017-09-04 14:51:44 +02:00
parent 2da7a93473
commit 4c5f0d184c
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2405,6 +2405,13 @@ errorReply(MXS_ROUTER *instance,
/* Force backend DCB close */ /* Force backend DCB close */
dcb_close(backend_dcb); dcb_close(backend_dcb);
/* Force Fake Client DCB close */
if (router->client)
{
dcb_close(router->client);
router->client = NULL;
}
MXS_ERROR("%s: Master connection error %lu '%s' in state '%s', " MXS_ERROR("%s: Master connection error %lu '%s' in state '%s', "
"%s while connecting to master [%s]:%d. Replication is stopped.", "%s while connecting to master [%s]:%d. Replication is stopped.",
router->service->name, router->m_errno, router->m_errmsg, router->service->name, router->m_errno, router->m_errmsg,
@ -2472,11 +2479,21 @@ errorReply(MXS_ROUTER *instance,
MXS_FREE(errmsg); MXS_FREE(errmsg);
} }
*succp = true; *succp = true;
/* Force Backend DCB close */
if (backend_dcb == router->master) if (backend_dcb == router->master)
{ {
router->master = NULL; router->master = NULL;
} }
dcb_close(backend_dcb); dcb_close(backend_dcb);
/* Force Fake Client DCB close */
if (router->client)
{
dcb_close(router->client);
router->client = NULL;
}
MXS_NOTICE("%s: Master %s disconnected after %ld seconds. " MXS_NOTICE("%s: Master %s disconnected after %ld seconds. "
"%lu events read.", "%lu events read.",
router->service->name, router->service->dbref->server->name, router->service->name, router->service->dbref->server->name,