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

Fixed debug assert. If session is closed its router session pointer is nullified and it is not error.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-14 22:35:23 +02:00
parent 18c12cfee6
commit e790437fc0
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -934,18 +934,7 @@ static void closeSession(
if (!router_cli_ses->rses_closed && if (!router_cli_ses->rses_closed &&
rses_begin_locked_router_action(router_cli_ses)) rses_begin_locked_router_action(router_cli_ses))
{ {
int i = 0; int i;
/**
* session must be moved to SESSION_STATE_STOPPING state before
* router session is closed.
*/
#if defined(SS_DEBUG)
SESSION* ses = get_session_by_router_ses((void*)router_cli_ses);
ss_dassert(ses != NULL);
ss_dassert(ses->state == SESSION_STATE_STOPPING);
#endif
/** /**
* This sets router closed. Nobody is allowed to use router * This sets router closed. Nobody is allowed to use router
* whithout checking this first. * whithout checking this first.
@ -955,8 +944,17 @@ static void closeSession(
for (i=0; i<router_cli_ses->rses_nbackends; i++) for (i=0; i<router_cli_ses->rses_nbackends; i++)
{ {
backend_ref_t* bref = &backend_ref[i]; backend_ref_t* bref = &backend_ref[i];
DCB* dcb = bref->bref_dcb; DCB* dcb = bref->bref_dcb;
#if defined(SS_DEBUG)
/**
* session must be moved to SESSION_STATE_STOPPING state before
* router session is closed.
*/
if (dcb->session != NULL)
{
ss_dassert(dcb->session->state == SESSION_STATE_STOPPING);
}
#endif
/** Close those which had been connected */ /** Close those which had been connected */
if (BREF_IS_IN_USE(bref)) if (BREF_IS_IN_USE(bref))
{ {