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

Read correct parameter for causal_reads

Browse Source 
The configuration used the wrong parameter name. The test also did not
explicitly enable tracking of the last_gtid variable which caused it to
fail if it wasn't already on.
This commit is contained in:
Markus Mäkelä
2018-07-22 11:35:05 +03:00
parent 823efffb00
commit d7a3980308
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/readwritesplit/readwritesplit.hh
View File

@ -158,8 +158,8 @@ struct Config
max_slave_replication_lag(config_get_integer(params, "max_slave_replication_lag")),
rw_max_slave_conn_percent(0),
max_slave_connections(0),
causal_reads(config_get_bool(params, "enable_causal_read")),
causal_reads_timeout(config_get_string(params, "causal_read_timeout")),
causal_reads(config_get_bool(params, "causal_reads")),
causal_reads_timeout(config_get_string(params, "causal_reads_timeout")),
master_reconnection(config_get_bool(params, "master_reconnection")),
delayed_retry(config_get_bool(params, "delayed_retry")),
delayed_retry_timeout(config_get_integer(params, "delayed_retry_timeout")),

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

@ -1083,7 +1083,7 @@ bool RWSplitSession::handle_got_target(GWBUF* querybuf, SRWBackend& target, bool
uint8_t cmd = mxs_mysql_get_command(querybuf);
GWBUF *send_buf = gwbuf_clone(querybuf);
if (cmd == COM_QUERY && m_config->causal_reads && !m_gtid_pos .empty())
if (m_config->causal_reads && cmd == COM_QUERY && !m_gtid_pos.empty())
{
send_buf = add_prefix_wait_gtid(target->server(), send_buf);
m_wait_gtid = WAITING_FOR_HEADER;

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

@ -363,9 +363,7 @@ GWBUF* RWSplitSession::handle_causal_read_reply(GWBUF *writebuf, SRWBackend& bac
{
if (GWBUF_IS_REPLY_OK(writebuf) && backend == m_current_master)
{
/** Save gtid position */
char *tmp = gwbuf_get_property(writebuf, MXS_LAST_GTID);
if (tmp)
if (char *tmp = gwbuf_get_property(writebuf, MXS_LAST_GTID))
{
m_gtid_pos = std::string(tmp);
}