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

Fix false error message in readwritesplit

Browse Source 
The error message for failure to find master wasn't included in the new
master error logging.
This commit is contained in:
Markus Makela
2016-11-09 08:01:02 +02:00
parent 8d893b4e56
commit b12a87ef04
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1859,12 +1859,16 @@ static int routeQuery(ROUTER *instance, void *router_session, GWBUF *querybuf)
* *
* @param rses Router session * @param rses Router session
*/ */
static void log_master_routing_failure(ROUTER_CLIENT_SES *rses, DCB *master_dcb, static void log_master_routing_failure(ROUTER_CLIENT_SES *rses, bool found,
DCB *curr_master_dcb) DCB *master_dcb, DCB *curr_master_dcb)
{ {
char errmsg[MAX_SERVER_NAME_LEN * 2 + 100]; // Extra space for error message char errmsg[MAX_SERVER_NAME_LEN * 2 + 100]; // Extra space for error message
if (master_dcb && curr_master_dcb) if (!found)
{
sprintf(errmsg, "Could not find a valid master connection");
}
else if (master_dcb && curr_master_dcb)
{ {
/** We found a master but it's not the same connection */ /** We found a master but it's not the same connection */
ss_dassert(master_dcb != curr_master_dcb); ss_dassert(master_dcb != curr_master_dcb);
@ -2338,7 +2342,7 @@ static bool route_single_stmt(ROUTER_INSTANCE *inst, ROUTER_CLIENT_SES *rses,
} }
else else
{ {
log_master_routing_failure(rses, master_dcb, curr_master_dcb); log_master_routing_failure(rses, succp, master_dcb, curr_master_dcb);
succp = false; succp = false;
} }