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

MXS-2942: Only DELETE monitors with no servers

Browse Source 
The behavior is now according to the documentation and is consistent with
how services behave.
This commit is contained in:
Markus Mäkelä
2020-03-24 10:55:54 +02:00
parent a412ed6211
commit 7b00d2c01b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/core/config_runtime.cc
View File

@ -1384,6 +1384,15 @@ bool runtime_destroy_service(Service* service)
bool runtime_destroy_monitor(MXS_MONITOR* monitor) bool runtime_destroy_monitor(MXS_MONITOR* monitor)
{ {
monitor_stop(monitor);
if (monitor->monitored_servers)
{
monitor_start(monitor, monitor->parameters);
config_runtime_error("Cannot destroy monitor '%s', it is monitoring servers.", monitor->name);
return false;
}
bool rval = false; bool rval = false;
char filename[PATH_MAX]; char filename[PATH_MAX];
snprintf(filename, sizeof(filename), "%s/%s.cnf", get_config_persistdir(), monitor->name); snprintf(filename, sizeof(filename), "%s/%s.cnf", get_config_persistdir(), monitor->name);
@ -1404,12 +1413,7 @@ bool runtime_destroy_monitor(MXS_MONITOR* monitor)
if (rval) if (rval)
{ {
monitor_stop(monitor); mxb_assert(!monitor->monitored_servers);
while (monitor->monitored_servers)
{
monitor_remove_server(monitor, monitor->monitored_servers->server);
}
monitor_deactivate(monitor); monitor_deactivate(monitor);
MXS_NOTICE("Destroyed monitor '%s'", monitor->name); MXS_NOTICE("Destroyed monitor '%s'", monitor->name);
} }