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

Expose function for checking MYSQL connection errors

Browse Source 
If a query done via the connector fails, the return value can be inspected
with the function. This helps separate fatal problems from transient ones.
This commit is contained in:
Markus Mäkelä
2018-06-11 09:31:18 +03:00
parent e74591cfe5
commit 8721c9117a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/maxscale/mysql_utils.h
View File

@ -41,6 +41,13 @@ char* mxs_lestr_consume(uint8_t** c, size_t *size);
*/ */
MYSQL* mxs_mysql_real_connect(MYSQL *mysql, SERVER *server, const char *user, const char *passwd); MYSQL* mxs_mysql_real_connect(MYSQL *mysql, SERVER *server, const char *user, const char *passwd);
/**
* Check if the MYSQL error number is a connection error
*
* @return True if the MYSQL error number is a connection error
*/
bool mxs_mysql_is_net_error(int errcode);
/** /**
* Execute a query * Execute a query
* *

4
server/core/mysql_utils.cc
View File

@ -217,7 +217,7 @@ MYSQL *mxs_mysql_real_connect(MYSQL *con, SERVER *server, const char *user, cons
return mysql; return mysql;
} }
static bool is_connection_error(int errcode) bool mxs_mysql_is_net_error(int errcode)
{ {
switch (errcode) switch (errcode)
{ {
@ -242,7 +242,7 @@ int mxs_mysql_query(MYSQL* conn, const char* query)
int rc = mysql_query(conn, query); int rc = mysql_query(conn, query);
for (int n = 0; rc != 0 && n < cnf->query_retries && for (int n = 0; rc != 0 && n < cnf->query_retries &&
is_connection_error(mysql_errno(conn)) && mxs_mysql_is_net_error(mysql_errno(conn)) &&
time(NULL) - start < cnf->query_retry_timeout; n++) time(NULL) - start < cnf->query_retry_timeout; n++)
{ {
rc = mysql_query(conn, query); rc = mysql_query(conn, query);