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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-08-03 15:51:15 +03:00
parent ae5eb004fe f7b8744460
commit 1f4856cdc5
11 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/auroramon/auroramon.c
View File

@ -80,10 +80,7 @@ void update_server_status(MXS_MONITOR *monitor, MXS_MONITOR_SERVERS *database)
}
else
{
MXS_ERROR("Failed to query server %s ([%s]:%d): %d, %s",
database->server->unique_name, database->server->name,
database->server->port, mysql_errno(database->con),
mysql_error(database->con));
mon_report_query_error(database);
}
}
else

16
server/modules/monitor/galeramon/galeramon.c
View File

@ -394,6 +394,10 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database)
}
mysql_free_result(result2);
}
else
{
mon_report_query_error(database);
}
}
else
{
@ -463,6 +467,10 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database)
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
}
/**
@ -878,9 +886,7 @@ static void update_sst_donor_nodes(MXS_MONITOR *mon, int is_cluster)
}
else
{
MXS_ERROR("Error while selecting 'wsrep_node_name' from node %s: %s",
ptr->server->unique_name,
mysql_error(ptr->con));
mon_report_query_error(ptr);
}
}
@ -907,9 +913,7 @@ static void update_sst_donor_nodes(MXS_MONITOR *mon, int is_cluster)
}
else
{
MXS_ERROR("SET GLOBAL rep_sst_donor error in node %s: %s",
ptr->server->unique_name,
mysql_error(ptr->con));
mon_report_query_error(ptr);
}
}

17
server/modules/monitor/mmmon/mmmon.c
View File

@ -291,7 +291,10 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database)
}
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
/* Check if the Slave_SQL_Running and Slave_IO_Running status is
* set to Yes
*/
@ -356,6 +359,10 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database)
isslave = 0;
}
}
else
{
mon_report_query_error(database);
}
}
else
{
@ -417,6 +424,10 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database)
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
}
/* get variable 'read_only' set by an external component */
@ -444,6 +455,10 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database)
}
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
/* Remove addition info */
monitor_clear_pending_status(database, SERVER_STALE_STATUS);

13
server/modules/monitor/mysqlmon/mysql_mon.c
View File

@ -543,6 +543,10 @@ static inline void monitor_mysql_db(MXS_MONITOR_SERVERS* database, MYSQL_SERVER_
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
}
/**
@ -595,7 +599,10 @@ static MXS_MONITOR_SERVERS *build_mysql51_replication_tree(MXS_MONITOR *mon)
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
/* Set the Slave Role */
if (ismaster)
@ -771,6 +778,10 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database)
}
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
/* Check first for MariaDB 10.x.x and get status for multi-master replication */
if (server_version >= 100000)

8
server/modules/monitor/ndbclustermon/ndbclustermon.c
View File

@ -250,6 +250,10 @@ monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultP
}
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
/* Check the the SQL node id in the MySQL cluster */
if (mysql_query(database->con, "SHOW STATUS LIKE 'Ndb_cluster_node_id'") == 0
@ -277,6 +281,10 @@ monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultP
}
mysql_free_result(result);
}
else
{
mon_report_query_error(database);
}
if (isjoined)
{