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

Detect double monitoring of servers

Browse Source 
Adding a server to multiple monitors is forbidden. This should be detected
and reported to the end user.

The information provided by the config_runtime system to the client isn't
as detailed as it could be. Some sort of an error message stack should be
added so that client facing interfaces could properly report the reason
for the failure. Currently the only way to detect the reason of the
failure is to parse the log files.
This commit is contained in:
Markus Makela
2016-12-11 09:14:53 +02:00
parent 312cf69739
commit cb218804ef
6 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/core/monitor.c
View File

@ -247,24 +247,17 @@ monitorStopAll()
* @param mon The Monitor instance
* @param server The Server to add to the monitoring
*/
void
monitorAddServer(MONITOR *mon, SERVER *server)
bool monitorAddServer(MONITOR *mon, SERVER *server)
{
bool new_server = true;
spinlock_acquire(&mon->lock);
bool rval = false;
for (MONITOR_SERVERS *db = mon->databases; db; db = db->next)
if (monitor_server_in_use(server))
{
if (db->server == server)
{
new_server = false;
}
MXS_ERROR("Server '%s' is already monitored.", server->unique_name);
}
spinlock_release(&mon->lock);
if (new_server)
else
{
rval = true;
MONITOR_SERVERS *db = (MONITOR_SERVERS *)MXS_MALLOC(sizeof(MONITOR_SERVERS));
MXS_ABORT_IF_NULL(db);
@ -307,6 +300,8 @@ monitorAddServer(MONITOR *mon, SERVER *server)
monitorStart(mon, mon->parameters);
}
}
return rval;
}
static void monitor_server_free(MONITOR_SERVERS *tofree)