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

MXS-2313: Fix candidate selection

Browse Source 
If a master with a better rank and a slave with a worse rank were
available and master_accept_reads wasn't enabled, the slave would be
preferred over the master. The check for master_accept_reads was done
twice and also in the wrong place.
This commit is contained in:
Markus Mäkelä
2019-03-11 09:48:35 +02:00
parent b2bf4d125b
commit 6befc7f7d4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,7 +672,7 @@ RWBackend* RWSplitSession::get_slave_backend(int max_rlag)
{ {
bool can_take_slave_into_use = !backend->in_use() && can_recover_servers() bool can_take_slave_into_use = !backend->in_use() && can_recover_servers()
&& backend->can_connect() && counts.second < m_router->max_slave_count() && backend->can_connect() && counts.second < m_router->max_slave_count()
&& (backend->is_slave() || (backend->is_master() && m_config.master_accept_reads)); && (backend->is_slave() || backend->is_master());
bool master_or_slave = backend->is_master() || backend->is_slave(); bool master_or_slave = backend->is_master() || backend->is_slave();
bool is_usable = backend->in_use() || can_take_slave_into_use; bool is_usable = backend->in_use() || can_take_slave_into_use;