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

Minor cleanup of route_single_stmt

Browse Source 
Moved transaction statistics calculations into a member function and
placed all target type specific processing into their respective
functions.

Also inverted the connection keepalive check to also cover hinted queries.
This commit is contained in:
Markus Mäkelä
2018-07-08 00:28:16 +03:00
parent 616fb30818
commit 98e233bb33
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,12 +238,7 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf)
} }
else else
{ {
if (session_trx_is_ending(m_client->session)) update_trx_statistics();
{
atomic_add_uint64(m_qc.is_trx_still_read_only() ?
&m_router->stats().n_ro_trx :
&m_router->stats().n_rw_trx, 1);
}
if (m_qc.is_trx_starting() && // A transaction is starting if (m_qc.is_trx_starting() && // A transaction is starting
!session_trx_is_read_only(m_client->session) && // Not explicitly read-only !session_trx_is_read_only(m_client->session) && // Not explicitly read-only
@ -281,11 +276,6 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf)
} }
else if (TARGET_IS_NAMED_SERVER(route_target) || TARGET_IS_RLAG_MAX(route_target)) else if (TARGET_IS_NAMED_SERVER(route_target) || TARGET_IS_RLAG_MAX(route_target))
{ {
/**
* There is a hint which either names the target backend or
* hint which sets maximum allowed replication lag for the
* backend.
*/
if ((target = handle_hinted_target(querybuf, route_target))) if ((target = handle_hinted_target(querybuf, route_target)))
{ {
succp = true; succp = true;
@ -308,14 +298,6 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf)
else if (TARGET_IS_MASTER(route_target)) else if (TARGET_IS_MASTER(route_target))
{ {
succp = handle_master_is_target(&target); succp = handle_master_is_target(&target);
if (!m_config->strict_multi_stmt &&
!m_config->strict_sp_calls &&
m_target_node == m_current_master)
{
/** Reset the forced node as we're in relaxed multi-statement mode */
m_target_node.reset();
}
} }
if (succp && target) if (succp && target)
@ -353,7 +335,6 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf)
{ {
retry_query(gwbuf_clone(querybuf)); retry_query(gwbuf_clone(querybuf));
succp = true; succp = true;
MXS_INFO("Delaying routing: %s", extract_sql(querybuf).c_str()); MXS_INFO("Delaying routing: %s", extract_sql(querybuf).c_str());
} }
else else
@ -363,8 +344,7 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf)
} }
} }
if (succp && m_config->connection_keepalive && if (succp && m_config->connection_keepalive && !TARGET_IS_ALL(route_target))
(TARGET_IS_SLAVE(route_target) || TARGET_IS_MASTER(route_target)))
{ {
handle_connection_keepalive(target); handle_connection_keepalive(target);
} }
@ -963,6 +943,13 @@ bool RWSplitSession::handle_master_is_target(SRWBackend* dest)
} }
} }
if (!m_config->strict_multi_stmt && !m_config->strict_sp_calls &&
m_target_node == m_current_master)
{
/** Reset the forced node as we're in relaxed multi-statement mode */
m_target_node.reset();
}
*dest = target; *dest = target;
return succp; return succp;
} }

10
server/modules/routing/readwritesplit/rwsplitsession.hh
View File

@ -270,6 +270,16 @@ private:
return buflen == MYSQL_HEADER_LEN + GW_MYSQL_MAX_PACKET_LEN; return buflen == MYSQL_HEADER_LEN + GW_MYSQL_MAX_PACKET_LEN;
} }
void update_trx_statistics()
{
if (session_trx_is_ending(m_client->session))
{
atomic_add_uint64(m_qc.is_trx_still_read_only() ?
&m_router->stats().n_ro_trx :
&m_router->stats().n_rw_trx, 1);
}
}
}; };
/** /**