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

Addition of DISCONNECT ALL and DISCONNECT SERVER

Browse Source 
Addition of DISCONNECT ALL and DISCONNECT SERVER server_id
Added dbc_close in closeSession
Changed slave mode output display in diagnostics
This commit is contained in:
MassimilianoPinto
2015-02-17 18:29:03 +01:00
parent dc65c9e1cc
commit 517524a8b4
2 changed files with 237 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/modules/routing/binlog/blr.c
View File

@ -34,6 +34,7 @@
* Date Who Description
* 02/04/2014 Mark Riddoch Initial implementation
* 17/02/2015 Massimiliano Pinto Addition of slave port and username in diagnostics
* 18/02/2015 Massimiliano Pinto Addition of dcb_close in closeSession
*
* @endverbatim
*/
@ -626,6 +627,14 @@ ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session;
/* Unlock */
rses_end_locked_router_action(slave);
/**
* Close the slave server connection
*/
if (slave->dcb != NULL) {
CHK_DCB(slave->dcb);
dcb_close(slave->dcb);
}
}
}
@ -915,18 +924,21 @@ struct tm tm;
dcb_printf(dcb, "\t\tSeconds behind master %u\n", router_inst->lastEventTimestamp - session->lastEventTimestamp);
}
if ((session->cstate & CS_UPTODATE) == 0)
if (session->state == 0)
{
dcb_printf(dcb, "\t\tSlave is in catchup mode. %s%s\n",
dcb_printf(dcb, "\t\tSlave_mode: connected\n");
}
else if ((session->cstate & CS_UPTODATE) == 0)
{
dcb_printf(dcb, "\t\tSlave_mode: catchup. %s%s\n",
((session->cstate & CS_EXPECTCB) == 0 ? "" :
"Waiting for DCB queue to drain."),
((session->cstate & CS_BUSY) == 0 ? "" :
" Busy in slave catchup."));
}
else
{
dcb_printf(dcb, "\t\tSlave is in normal mode.\n");
dcb_printf(dcb, "\t\tSlave_mode: follow\n");
if (session->binlog_pos != router_inst->binlog_position)
{
dcb_printf(dcb, "\t\tSlave reports up to date however "