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

Added option to disable slave recovery in readwritesplit.

Browse Source
This commit is contained in:
Markus Makela
2015-04-24 05:55:06 +03:00
parent 7cdf32773f
commit 21ad6fba2a
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,6 +251,7 @@ typedef struct rwsplit_config_st {
target_t rw_use_sql_variables_in; target_t rw_use_sql_variables_in;
int rw_max_sescmd_history_size; int rw_max_sescmd_history_size;
bool disable_sescmd_hist; bool disable_sescmd_hist;
bool disable_slave_recovery;
} rwsplit_config_t; } rwsplit_config_t;

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

@ -2789,16 +2789,16 @@ static void clientReply (
bool rconn = false; bool rconn = false;
writebuf = sescmd_cursor_process_replies(writebuf, bref, &rconn); writebuf = sescmd_cursor_process_replies(writebuf, bref, &rconn);
if(rconn) if(rconn && !router_inst->rwsplit_config.disable_slave_recovery)
{ {
select_connect_backend_servers(&router_cli_ses->rses_master_ref, select_connect_backend_servers(&router_cli_ses->rses_master_ref,
router_cli_ses->rses_backend_ref, router_cli_ses->rses_backend_ref,
router_cli_ses->rses_nbackends, router_cli_ses->rses_nbackends,
router_cli_ses->rses_config.rw_max_slave_conn_count, router_cli_ses->rses_config.rw_max_slave_conn_count,
router_cli_ses->rses_config.rw_max_slave_replication_lag, router_cli_ses->rses_config.rw_max_slave_replication_lag,
router_cli_ses->rses_config.rw_slave_select_criteria, router_cli_ses->rses_config.rw_slave_select_criteria,
router_cli_ses->rses_master_ref->bref_dcb->session, router_cli_ses->rses_master_ref->bref_dcb->session,
router_cli_ses->router); router_cli_ses->router);
} }
} }
/** /**
@ -4588,6 +4588,10 @@ static void rwsplit_process_router_options(
{ {
router->rwsplit_config.disable_sescmd_hist = config_truth_value(value); router->rwsplit_config.disable_sescmd_hist = config_truth_value(value);
} }
else if(strcmp(options[i],"disable_slave_recovery") == 0)
{
router->rwsplit_config.disable_slave_recovery = config_truth_value(value);
}
} }
} /*< for */ } /*< for */
} }
@ -4830,6 +4834,12 @@ static bool handle_error_new_connection(
* Try to get replacement slave or at least the minimum * Try to get replacement slave or at least the minimum
* number of slave connections for router session. * number of slave connections for router session.
*/ */
if(inst->rwsplit_config.disable_slave_recovery)
{
succp = have_enough_servers(&rses,1,router_nservers,inst) ? true : false;
}
else
{
succp = select_connect_backend_servers( succp = select_connect_backend_servers(
&rses->rses_master_ref, &rses->rses_master_ref,
rses->rses_backend_ref, rses->rses_backend_ref,
@ -4839,6 +4849,7 @@ static bool handle_error_new_connection(
rses->rses_config.rw_slave_select_criteria, rses->rses_config.rw_slave_select_criteria,
ses, ses,
inst); inst);
}
return_succp: return_succp:
return succp; return succp;