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

Fix session close in RoundRobinRouter

Browse Source 
SERVER_REF->connections was decremented from the wrong struct.
This commit is contained in:
Esa Korhonen
2017-03-28 16:54:53 +03:00
parent 88b87aceb5
commit 07cc42927a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/roundrobinrouter.cpp
View File

@ -456,15 +456,21 @@ void RRRouterSession::close()
* of most API functions to quickly stop the processing of closed sessions. * of most API functions to quickly stop the processing of closed sessions.
*/ */
m_closed = true; m_closed = true;
int closed_conns = 0;
for (unsigned int i = 0; i < m_backend_dcbs.size(); i++) for (unsigned int i = 0; i < m_backend_dcbs.size(); i++)
{ {
DCB* dcb = m_backend_dcbs[i]; DCB* dcb = m_backend_dcbs[i];
SERVER_REF* sref = dcb->service->dbref; SERVER_REF* sref = dcb->service->dbref;
dcb_close(dcb); while (sref && (sref->server != dcb->server))
closed_conns++; {
sref = sref->next;
}
if (sref)
{
atomic_add(&(sref->connections), -1); atomic_add(&(sref->connections), -1);
} }
dcb_close(dcb);
}
int closed_conns = m_backend_dcbs.size();
m_backend_dcbs.clear(); m_backend_dcbs.clear();
if (m_write_dcb) if (m_write_dcb)
{ {