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

Fix to bug 638: http://bugs.mariadb.com/show_bug.cgi?id=638

Browse Source 
readwritesplit.c:Added missing backend type when using max_slave_replication_lag hint.
This commit is contained in:
Markus Makela
2015-01-05 14:28:16 +02:00
parent 468ce72c18
commit 91a3109f4d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2235,7 +2235,7 @@ static bool route_single_stmt(
{ {
rlag_max = rses_get_max_replication_lag(rses); rlag_max = rses_get_max_replication_lag(rses);
} }
btype = BE_UNDEFINED; /*< target may be master or slave */ btype = route_target & TARGET_SLAVE ? BE_SLAVE : BE_MASTER; /*< target may be master or slave */
/** /**
* Search backend server by name or replication lag. * Search backend server by name or replication lag.
* If it fails, then try to find valid slave or master. * If it fails, then try to find valid slave or master.
@ -4684,15 +4684,16 @@ static bool have_enough_servers(
} }
if (nservers < min_nsrv) if (nservers < min_nsrv)
{ {
LOGIF(LE, (skygw_log_write_flush( double dbgpct = ((double)min_nsrv/(double)router_nsrv)*100.0;
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Unable to start %s service. There are " "Error : Unable to start %s service. There are "
"too few backend servers configured in " "too few backend servers configured in "
"MaxScale.cnf. Found %d%% when at least %d%% " "MaxScale.cnf. Found %d%% when at least %.0f%% "
"would be required.", "would be required.",
router->service->name, router->service->name,
(*p_rses)->rses_config.rw_max_slave_conn_percent, (*p_rses)->rses_config.rw_max_slave_conn_percent,
(double)min_nsrv/((double)router_nsrv/100.0)))); dbgpct)));
} }
} }
free(*p_rses); free(*p_rses);