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

Version errors for SHOW SLAVE STATUS now only print once.

Browse Source
This commit is contained in:
Markus Makela
2015-06-29 10:24:16 +03:00
parent 5c7a30e9fe
commit 0062d9d2b7
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/monitor.c
View File

@ -192,6 +192,7 @@ monitorAddServer(MONITOR *mon, SERVER *server)
db->con = NULL; db->con = NULL;
db->next = NULL; db->next = NULL;
db->mon_err_count = 0; db->mon_err_count = 0;
db->log_version_err = true;
/** Server status is uninitialized */ /** Server status is uninitialized */
db->mon_prev_status = -1; db->mon_prev_status = -1;
/* pending status is updated by get_replication_tree */ /* pending status is updated by get_replication_tree */

1
server/include/monitor.h
View File

@ -124,6 +124,7 @@ typedef enum
typedef struct monitor_servers { typedef struct monitor_servers {
SERVER *server; /**< The server being monitored */ SERVER *server; /**< The server being monitored */
MYSQL *con; /**< The MySQL connection */ MYSQL *con; /**< The MySQL connection */
bool log_version_err;
int mon_err_count; int mon_err_count;
unsigned int mon_prev_status; unsigned int mon_prev_status;
unsigned int pending_status; /**< Pending Status flag bitmap */ unsigned int pending_status; /**< Pending Status flag bitmap */

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

@ -454,10 +454,15 @@ char *server_string;
mysql_free_result(result); mysql_free_result(result);
if(server_version < 5*10000 + 5*100) if(server_version < 5*10000 + 5*100)
{
if(database->log_version_err)
{ {
skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" " skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
" for MySQL 5.1 does not have master_server_id, replication tree cannot be resolved." " for versions less than 5.5 does not have master_server_id, "
" MySQL Version: %s",version_str); "replication tree cannot be resolved for server %s."
" MySQL Version: %s",database->server->unique_name,version_str);
database->log_version_err = false;
}
} }
else else
{ {

9
server/modules/monitor/mysql_mon.c
View File

@ -492,10 +492,15 @@ char *server_string;
{ {
mysql_free_result(result); mysql_free_result(result);
if(server_version < 5*10000 + 5*100) if(server_version < 5*10000 + 5*100)
{
if(database->log_version_err)
{ {
skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" " skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" "
" for MySQL 5.1 does not have master_server_id, replication tree cannot be resolved." " for versions less than 5.5 does not have master_server_id, "
" MySQL Version: %s",version_str); "replication tree cannot be resolved for server %s."
" MySQL Version: %s",database->server->unique_name,version_str);
database->log_version_err = false;
}
} }
else else
{ {