diff --git a/server/core/monitor.c b/server/core/monitor.c index 0f24e691d..f422b4f6b 100644 --- a/server/core/monitor.c +++ b/server/core/monitor.c @@ -192,6 +192,7 @@ monitorAddServer(MONITOR *mon, SERVER *server) db->con = NULL; db->next = NULL; db->mon_err_count = 0; + db->log_version_err = true; /** Server status is uninitialized */ db->mon_prev_status = -1; /* pending status is updated by get_replication_tree */ diff --git a/server/include/monitor.h b/server/include/monitor.h index 681f34bac..442efb27f 100644 --- a/server/include/monitor.h +++ b/server/include/monitor.h @@ -124,6 +124,7 @@ typedef enum typedef struct monitor_servers { SERVER *server; /**< The server being monitored */ MYSQL *con; /**< The MySQL connection */ + bool log_version_err; int mon_err_count; unsigned int mon_prev_status; unsigned int pending_status; /**< Pending Status flag bitmap */ diff --git a/server/modules/monitor/mmmon.c b/server/modules/monitor/mmmon.c index e70b3684a..40c2c11fb 100644 --- a/server/modules/monitor/mmmon.c +++ b/server/modules/monitor/mmmon.c @@ -455,9 +455,14 @@ char *server_string; if(server_version < 5*10000 + 5*100) { - skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" " - " for MySQL 5.1 does not have master_server_id, replication tree cannot be resolved." - " MySQL Version: %s",version_str); + if(database->log_version_err) + { + skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" " + " for versions less than 5.5 does not have master_server_id, " + "replication tree cannot be resolved for server %s." + " MySQL Version: %s",database->server->unique_name,version_str); + database->log_version_err = false; + } } else { diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c index d2fa7acbd..2ba70a499 100644 --- a/server/modules/monitor/mysql_mon.c +++ b/server/modules/monitor/mysql_mon.c @@ -493,9 +493,14 @@ char *server_string; mysql_free_result(result); if(server_version < 5*10000 + 5*100) { - skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" " - " for MySQL 5.1 does not have master_server_id, replication tree cannot be resolved." - " MySQL Version: %s",version_str); + if(database->log_version_err) + { + skygw_log_write(LE,"Error: \"SHOW SLAVE STATUS\" " + " for versions less than 5.5 does not have master_server_id, " + "replication tree cannot be resolved for server %s." + " MySQL Version: %s",database->server->unique_name,version_str); + database->log_version_err = false; + } } else {