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

MXS-1506: Store query if delayed_retry is enabled

Browse Source 
The delayed retrying depends on the current query being stored.
This commit is contained in:
Markus Mäkelä
2018-04-07 10:36:58 +03:00
parent 997835c7f8
commit 52c55a365e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -130,6 +130,7 @@ bool RWSplitSession::prepare_target(SRWBackend& target, route_target_t route_tar
void RWSplitSession::retry_query(GWBUF* querybuf) void RWSplitSession::retry_query(GWBUF* querybuf)
{ {
ss_dassert(querybuf);
// Try to route the query again later // Try to route the query again later
MXS_SESSION* session = m_client->session; MXS_SESSION* session = m_client->session;
session_delay_routing(session, router_as_downstream(session), querybuf, 1); session_delay_routing(session, router_as_downstream(session), querybuf, 1);
@ -171,7 +172,8 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf, const RouteInfo& info)
} }
else else
{ {
bool store_stmt = false; // If delayed query retry is enabled, we need to store the current statement
bool store_stmt = m_config.delayed_retry;
if (m_qc.large_query()) if (m_qc.large_query())
{ {
@ -233,7 +235,6 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf, const RouteInfo& info)
else else
{ {
// Target server was found and is in the correct state // Target server was found and is in the correct state
ss_dassert(!store_stmt || TARGET_IS_SLAVE(route_target));
succp = handle_got_target(querybuf, target, store_stmt); succp = handle_got_target(querybuf, target, store_stmt);
if (succp && command == MXS_COM_STMT_EXECUTE && not_locked_to_master) if (succp && command == MXS_COM_STMT_EXECUTE && not_locked_to_master)