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

MXS-2219 Allow starting Clx monitor with no servers

Browse Source
This commit is contained in:
Johan Wikman
2019-01-15 10:00:53 +02:00
parent 640bf40eed
commit bd2eb3d5dc
2 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
server/modules/monitor/clustrixmon/clustrixmonitor.cc
View File

@ -42,12 +42,6 @@ ClustrixMonitor* ClustrixMonitor::create(MXS_MONITOR* pMonitor)
bool ClustrixMonitor::configure(const MXS_CONFIG_PARAMETER* pParams) bool ClustrixMonitor::configure(const MXS_CONFIG_PARAMETER* pParams)
{ {
if (!m_monitor->monitored_servers)
{
MXS_WARNING("No servers specified, cannot start monitor.");
return false;
}
m_health_urls.clear(); m_health_urls.clear();
m_node_infos.clear(); m_node_infos.clear();
@ -92,37 +86,9 @@ void ClustrixMonitor::tick()
break; break;
case http::Async::READY: case http::Async::READY:
{ if (m_monitor->monitored_servers)
auto b = std::begin(*m_monitor->monitored_servers); {
auto e = std::end(*m_monitor->monitored_servers); update_server_statuses();
for_each(b, e,
[this](MXS_MONITORED_SERVER& ms) {
monitor_stash_current_status(&ms);
auto it = find_if(m_node_infos.begin(), m_node_infos.end(),
[&ms](const ClustrixNodeInfo& info) -> bool {
return ms.server->address == info.ip();
});
if (it != m_node_infos.end())
{
if (it->is_running())
{
monitor_set_pending_status(&ms, SERVER_RUNNING);
}
else
{
monitor_clear_pending_status(&ms, SERVER_RUNNING);
}
}
else
{
monitor_clear_pending_status(&ms, SERVER_RUNNING);
}
});
make_health_check(); make_health_check();
} }
break; break;
@ -232,12 +198,47 @@ void ClustrixMonitor::refresh_cluster_nodes()
fetch_cluster_nodes(); fetch_cluster_nodes();
} }
} }
else else if (m_monitor->monitored_servers)
{ {
fetch_cluster_nodes(); fetch_cluster_nodes();
} }
} }
void ClustrixMonitor::update_server_statuses()
{
mxb_assert(m_monitor->monitored_servers);
auto b = std::begin(*m_monitor->monitored_servers);
auto e = std::end(*m_monitor->monitored_servers);
for_each(b, e,
[this](MXS_MONITORED_SERVER& ms) {
monitor_stash_current_status(&ms);
auto it = find_if(m_node_infos.begin(), m_node_infos.end(),
[&ms](const ClustrixNodeInfo& info) -> bool {
return ms.server->address == info.ip();
});
if (it != m_node_infos.end())
{
if (it->is_running())
{
monitor_set_pending_status(&ms, SERVER_RUNNING);
}
else
{
monitor_clear_pending_status(&ms, SERVER_RUNNING);
}
}
else
{
monitor_clear_pending_status(&ms, SERVER_RUNNING);
}
});
}
void ClustrixMonitor::make_health_check() void ClustrixMonitor::make_health_check()
{ {
mxb_assert(m_http.status() != http::Async::PENDING); mxb_assert(m_http.status() != http::Async::PENDING);

1
server/modules/monitor/clustrixmon/clustrixmonitor.hh
View File

@ -73,6 +73,7 @@ private:
void fetch_cluster_nodes(); void fetch_cluster_nodes();
void fetch_cluster_nodes_from(MXS_MONITORED_SERVER& ms); void fetch_cluster_nodes_from(MXS_MONITORED_SERVER& ms);
void refresh_cluster_nodes(); void refresh_cluster_nodes();
void update_server_statuses();
void make_health_check(); void make_health_check();
void initiate_delayed_http_check(); void initiate_delayed_http_check();