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

MXS-2587: Never route stored queries in routeQuery

Browse Source 
This could end up in infinite mutual recursion if no responses are
expected. Although this does not happen now that MXS-2587 is fixed, the
code should not even be there.
This commit is contained in:
Markus Mäkelä
2019-07-04 08:38:31 +03:00
parent 7270ff7ac0
commit e516c11ac5
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -175,24 +175,15 @@ int32_t RWSplitSession::routeQuery(GWBUF* querybuf)
} }
else else
{ {
/** // We are already processing a request from the client. Store the new query and wait for the previous
* We are already processing a request from the client. Store the // one to complete.
* new query and wait for the previous one to complete.
*/
mxb_assert(m_expected_responses > 0 || !m_query_queue.empty());
MXS_INFO("Storing query (len: %d cmd: %0x), expecting %d replies to current command", MXS_INFO("Storing query (len: %d cmd: %0x), expecting %d replies to current command",
gwbuf_length(querybuf), gwbuf_length(querybuf), GWBUF_DATA(querybuf)[4], m_expected_responses);
GWBUF_DATA(querybuf)[4], mxb_assert(m_expected_responses > 0 || !m_query_queue.empty());
m_expected_responses);
m_query_queue.emplace_back(querybuf); m_query_queue.emplace_back(querybuf);
querybuf = NULL; querybuf = NULL;
rval = 1; rval = 1;
mxb_assert(m_expected_responses != 0); mxb_assert(m_expected_responses != 0);
if (m_expected_responses == 0 && !route_stored_query())
{
rval = 0;
}
} }
if (querybuf != NULL) if (querybuf != NULL)