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

Destroy monitor only if it's not used

Browse Source 
If a service uses a monitor as the source of its servers, it must not be
destroyed before the monitor is removed from all services that use it.
This commit is contained in:
Markus Mäkelä
2019-04-01 10:46:33 +03:00
parent 84bf241dd1
commit 1417292f0d
3 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/core/config_runtime.cc
View File

@ -1457,21 +1457,30 @@ bool runtime_destroy_service(Service* service)
bool runtime_destroy_monitor(Monitor* monitor)
{
bool rval = false;
char filename[PATH_MAX];
snprintf(filename, sizeof(filename), "%s/%s.cnf", get_config_persistdir(), monitor->m_name);
std::lock_guard<std::mutex> guard(crt_lock);
if (unlink(filename) == -1 && errno != ENOENT)
if (Service* s = service_uses_monitor(monitor))
{
MXS_ERROR("Failed to remove persisted monitor configuration '%s': %d, %s",
filename,
errno,
mxs_strerror(errno));
config_runtime_error("Monitor '%s' cannot be destroyed as it is used by service '%s'",
monitor->m_name, s->name());
}
else
{
rval = true;
char filename[PATH_MAX];
snprintf(filename, sizeof(filename), "%s/%s.cnf", get_config_persistdir(), monitor->m_name);
std::lock_guard<std::mutex> guard(crt_lock);
if (unlink(filename) == -1 && errno != ENOENT)
{
MXS_ERROR("Failed to remove persisted monitor configuration '%s': %d, %s",
filename,
errno,
mxs_strerror(errno));
}
else
{
rval = true;
}
}
if (rval)