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

MXS-1775 Monitor loop and monitoring separated

Browse Source 
In preparation for moving the monitor loop to MonitorInstance.
This commit is contained in:
Johan Wikman
2018-05-16 15:28:49 +03:00
parent 6fff5a4f23
commit 2396b555f8
10 changed files with 234 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/monitor/grmon/grmon.cc
View File

@ -192,12 +192,8 @@ void GRMon::main()
lock_monitor_servers(m_monitor);
servers_status_pending_to_current(m_monitor);
for (MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(m_monitor, ptr);
}
tick();
mon_hangup_failed_servers(m_monitor);
/**
* After updating the status of all servers, check if monitor events
* need to be launched.
@ -206,6 +202,7 @@ void GRMon::main()
m_script.empty() ? NULL : m_script.c_str(),
m_events);
mon_hangup_failed_servers(m_monitor);
servers_status_current_to_pending(m_monitor);
store_server_journal(m_monitor, NULL);
release_monitor_servers(m_monitor);
@ -225,6 +222,14 @@ void GRMon::main()
}
}
void GRMon::tick()
{
for (MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(m_monitor, ptr);
}
}
/**
* The module entry point routine. It is this routine that
* must populate the structure that is referred to as the

1
server/modules/monitor/grmon/grmon.hh
View File

@ -39,6 +39,7 @@ private:
bool has_sufficient_permissions() const;
void configure(const MXS_CONFIG_PARAMETER* params);
void tick();
void main();
};