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

Added new parameter RW Split Router.max_slave_connections=[<int>|<int>%] which specifies the maximum number of slaves which read/write split router connects in each routing session.

Browse Source 
Parameter it read from config file to CONFIG_CONTEXT's parameter list. It is qualified in service.c:service_set_slave_conn_limit and if qualified, the qualified integer value and the value type are copied to the CONFIG_PARAMETER structure.

This CONFIG_PARAMETER struct is cloned (=copied to different memory area) and linked to RW Split SERVICE struct.

When RW Split router_instance is created in readwritesplit.c:createInstance, the value is copied to (new) rwsplit_config_t structure from SERVICE's parameter list.

When new routing session is created in readwritesplit.c:newSession, the rwsplit_config_t structure is copied to ROUTER_CLIENT_SES struct and the actual max_nslaves value is calculated from the config value (if percentage is used).

Tests and many error handling branches are missing but functionality seems to be working.
This commit is contained in:
VilhoRaatikka
2014-04-24 22:05:26 +03:00
parent 04313caf82
commit 28bc3509cc
7 changed files with 373 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/include/readwritesplit.h
View File

@ -121,6 +121,12 @@ typedef struct backend {
#endif
} BACKEND;
typedef struct rwsplit_config_st {
int rw_max_slave_conn_percent;
int rw_max_slave_conn_count;
} rwsplit_config_t;
/**
* The client session structure used within this router.
*/
@ -135,6 +141,7 @@ struct router_client_session {
rses_property_t* rses_properties[RSES_PROP_TYPE_COUNT];
BACKEND* rses_master; /*< Pointer to master */
BACKEND** rses_backend; /*< All backends used by client session */
rwsplit_config_t rses_config; /*< copied config info from router instance */
int rses_nbackends;
int rses_capabilities; /*< input type, for example */
struct router_client_session* next;
@ -164,6 +171,7 @@ typedef struct router_instance {
SPINLOCK lock; /*< Lock for the instance data */
BACKEND** servers; /*< Backend servers */
BACKEND* master; /*< NULL or pointer */
rwsplit_config_t rwsplit_config; /*< expanded config info from SERVICE */
unsigned int bitmask; /*< Bitmask to apply to server->status */
unsigned int bitvalue; /*< Required value of server->status */
ROUTER_STATS stats; /*< Statistics for this router */

10
server/modules/routing/readconnroute.c
View File

@ -252,10 +252,12 @@ int i, n;
}
else
{
LOGIF(LE, (skygw_log_write(
LOGFILE_ERROR,
"Warning : Unsupported router "
"option %s for readconnroute.",
LOGIF(LM, (skygw_log_write(
LOGFILE_MESSAGE,
"* Warning : Unsupported router "
"option \'%s\' for readconnroute. "
"Expected router options are "
"[slave|master|synced]",
options[i])));
}
}

68
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -154,11 +154,7 @@ static GWBUF* sescmd_cursor_process_replies(
GWBUF* replybuf,
sescmd_cursor_t* scur);
static bool cont_exec_sescmd_in_backend(
ROUTER_CLIENT_SES* rses,
backend_type_t be_type);
#if !defined(MAX95)
#if 0 /*< disabled for now due multiple slaves changes */
static void tracelog_routed_query(
ROUTER_CLIENT_SES* rses,
char* funcname,
@ -227,10 +223,12 @@ static ROUTER* createInstance(
SERVICE* service,
char** options)
{
ROUTER_INSTANCE* router;
SERVER* server;
int nservers;
int i;
ROUTER_INSTANCE* router;
SERVER* server;
int nservers;
int i;
CONFIG_PARAMETER* param;
config_param_type_t paramtype;
if ((router = calloc(1, sizeof(ROUTER_INSTANCE))) == NULL) {
return NULL;
@ -327,6 +325,27 @@ static ROUTER* createInstance(
}
}
}
/**
* Copy config parameter value from service struct. This becomes the
* default value for every new rwsplit router session.
*/
param = config_get_param(service->svc_config_param, "max_slave_connections");
if (param != NULL)
{
paramtype = config_get_paramtype(param);
if (paramtype == COUNT_TYPE)
{
router->rwsplit_config.rw_max_slave_conn_count =
config_get_valint(param, NULL, paramtype);
}
else if (paramtype == PERCENT_TYPE)
{
router->rwsplit_config.rw_max_slave_conn_percent =
config_get_valint(param, NULL, paramtype);
}
}
/**
* We have completed the creation of the router data, so now
* insert this router into the linked list of routers
@ -350,7 +369,6 @@ static ROUTER* createInstance(
* @param session The session itself
* @return Session specific data for this session
*/
const int conf_max_nslaves = 2; /*< replaces configuration parameter until its developed */
static void* newSession(
ROUTER* router_inst,
@ -363,7 +381,8 @@ static void* newSession(
ROUTER_INSTANCE* router = (ROUTER_INSTANCE *)router_inst;
bool succp;
int router_nservers = 0; /*< # of servers in total */
int max_nslaves; /*< max # of slaves used in this session */
int max_nslaves; /*< max # of slaves used in this session */
int conf_max_nslaves; /*< value from configuration file */
b = router->servers;
@ -376,7 +395,6 @@ static void* newSession(
/** log */
goto return_rses;
}
max_nslaves = MIN(router_nservers-1, MAX(1, conf_max_nslaves));
client_rses = (ROUTER_CLIENT_SES *)calloc(1, sizeof(ROUTER_CLIENT_SES));
if (client_rses == NULL)
@ -384,6 +402,23 @@ static void* newSession(
ss_dassert(false);
goto return_rses;
}
/** Copy config struct from router instance */
client_rses->rses_config = router->rwsplit_config;
/**
* Either copy direct count of slave connections or calculate the count
* from percentage value.
*/
if (client_rses->rses_config.rw_max_slave_conn_count > 0)
{
conf_max_nslaves = client_rses->rses_config.rw_max_slave_conn_count;
}
else
{
conf_max_nslaves =
(router_nservers*client_rses->rses_config.rw_max_slave_conn_percent)/100;
}
max_nslaves = MIN(router_nservers-1, MAX(1, conf_max_nslaves));
pp_backend = (BACKEND **)calloc(1, (router_nservers)*sizeof(BACKEND *));
/**
@ -1033,7 +1068,7 @@ static void clientReply(
}
be = router_cli_ses->rses_backend;
while (be !=NULL)
while (*be !=NULL)
{
if ((*be)->be_dcb == backend_dcb)
{
@ -1169,7 +1204,7 @@ static bool select_connect_backend_servers(
router->bitmask)));
if (SERVER_IS_RUNNING((*b)->backend_server) &&
((*b)->backend_server->status & router->bitmask ==
(((*b)->backend_server->status & router->bitmask) ==
router->bitvalue))
{
if (slaves_found < max_nslaves &&
@ -1871,8 +1906,6 @@ static bool route_session_write(
skygw_query_type_t qtype)
{
bool succp;
DCB* master_dcb;
DCB* slave_dcb;
rses_property_t* prop;
BACKEND** b;
@ -1894,8 +1927,7 @@ static bool route_session_write(
if (packet_type == COM_QUIT)
{
int rc;
int rc2;
succp = true;
while (*b != NULL)