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

MXS-2314 Populate services with servers

Browse Source 
The services whose servers are defined using a monitor, will
now be populated from the monitor.

Note, no consideration has yet been given to runtime changes.
This commit is contained in:
Johan Wikman
2019-02-06 14:38:48 +02:00
parent f271c5cea1
commit b4eb87dfcc
6 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/core/monitor.cc
View File

@ -48,6 +48,7 @@
#include "internal/monitor.hh"
#include "internal/modules.hh"
#include "internal/server.hh"
#include "internal/service.hh"
/** Schema version, journals must have a matching version */
#define MMB_SCHEMA_VERSION 2
@ -278,6 +279,14 @@ void MonitorManager::monitor_start(Monitor* monitor, const MXS_CONFIG_PARAMETER*
}
}
void MonitorManager::populate_services()
{
this_unit.foreach_monitor([](Monitor* pMonitor) -> bool {
pMonitor->populate_services();
return true;
});
}
/**
* Start all monitors
*/
@ -2364,8 +2373,16 @@ bool Monitor::clear_server_status(SERVER* srv, int bit, string* errmsg_out)
}
return written;
}
void Monitor::populate_services()
{
mxb_assert(m_state == MONITOR_STATE_STOPPED);
for (MXS_MONITORED_SERVER* pMs : m_servers)
{
service_add_server(this, pMs->server);
}
}
void monitor_debug_wait()