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

Added check for session state before calling router->sessionClose

Browse Source
This commit is contained in:
VilhoRaatikka
2014-07-30 20:54:43 +03:00
parent ad96ca66a5
commit ef924cdc00
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/modules/protocol/mysql_client.c
View File

@ -1331,12 +1331,25 @@ gw_client_close(DCB *dcb)
* session may be NULL if session_alloc failed. * session may be NULL if session_alloc failed.
* In that case, router session wasn't created. * In that case, router session wasn't created.
*/ */
if (session != NULL) { if (session != NULL)
{
CHK_SESSION(session); CHK_SESSION(session);
spinlock_acquire(&session->ses_lock); spinlock_acquire(&session->ses_lock);
if (session->state == SESSION_STATE_STOPPING)
{
/**
* Session is already getting closed so avoid
* redundant calls
*/
spinlock_release(&session->ses_lock);
return 1;
}
else
{
session->state = SESSION_STATE_STOPPING; session->state = SESSION_STATE_STOPPING;
spinlock_release(&session->ses_lock); spinlock_release(&session->ses_lock);
}
router = session->service->router; router = session->service->router;
router_instance = session->service->router_instance; router_instance = session->service->router_instance;
rsession = session->router_session; rsession = session->router_session;