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

MXS-1503: Respect max_slave_connections

Browse Source 
The slave selection now again respects max_slave_connections. This means
that the amount of slave connections each session has will never grow
beyond the configured value.
This commit is contained in:
Markus Mäkelä
2018-03-28 13:07:38 +03:00
parent 4cf9bec10b
commit 7e4665b03b
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/routing/readwritesplit/rwsplit_internal.hh
View File

@ -15,6 +15,7 @@
#include "readwritesplit.hh" #include "readwritesplit.hh"
#include <string> #include <string>
#include <utility>
#include <maxscale/query_classifier.h> #include <maxscale/query_classifier.h>
#include <maxscale/protocol/mysql.h> #include <maxscale/protocol/mysql.h>
@ -100,6 +101,17 @@ bool select_connect_backend_servers(RWSplit *inst, MXS_SESSION *session,
int* expected_responses, int* expected_responses,
connection_type type); connection_type type);
SRWBackend get_root_master(const SRWBackendList& backends); SRWBackend get_root_master(const SRWBackendList& backends);
/**
* Get total slave count and connected slave count
*
* @param backends List of backend servers
* @param master Current master
*
* @return Total number of slaves and number of slaves we are connected to
*/
std::pair<int, int> get_slave_counts(SRWBackendList& backends, SRWBackend& master);
/* /*
* The following are implemented in rwsplit_tmp_table_multi.c * The following are implemented in rwsplit_tmp_table_multi.c
*/ */

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

@ -389,6 +389,7 @@ SRWBackend get_hinted_backend(RWSplitSession *rses, char *name)
SRWBackend get_slave_backend(RWSplitSession *rses, int max_rlag) SRWBackend get_slave_backend(RWSplitSession *rses, int max_rlag)
{ {
SRWBackend rval; SRWBackend rval;
auto counts = get_slave_counts(rses->backends, rses->current_master);
for (auto it = rses->backends.begin(); it != rses->backends.end(); it++) for (auto it = rses->backends.begin(); it != rses->backends.end(); it++)
{ {
@ -406,7 +407,7 @@ SRWBackend get_slave_backend(RWSplitSession *rses, int max_rlag)
rval = backend; rval = backend;
} }
} }
else else if (backend->in_use() || counts.second < rses->router->max_slave_count())
{ {
if (!rses->rses_config.master_accept_reads && rval->is_master()) if (!rses->rses_config.master_accept_reads && rval->is_master())
{ {