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

MXS-1775 Wait the same way in all monitors

Browse Source
This commit is contained in:
Johan Wikman 2018-05-16 16:31:40 +03:00
parent 2396b555f8
commit 6eef6f52db
3 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/modules/monitor/galeramon/galeramon.cc
View File

@ -452,31 +452,10 @@ void GaleraMonitor::monitorDatabase(MXS_MONITORED_SERVER *database)
*/
void GaleraMonitor::main()
{
size_t nrounds = 0;
load_server_journal(m_monitor, NULL);
while (!m_shutdown)
{
/** Wait base interval */
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
/**
* Calculate how far away the monitor interval is from its full
* cycle and if monitor interval time further than the base
* interval, then skip monitoring checks. Excluding the first
* round.
*/
if (nrounds != 0 &&
(((nrounds * MXS_MON_BASE_INTERVAL_MS) % m_monitor->interval) >=
MXS_MON_BASE_INTERVAL_MS) && (!m_monitor->server_pending_changes))
{
nrounds += 1;
continue;
}
nrounds += 1;
lock_monitor_servers(m_monitor);
servers_status_pending_to_current(m_monitor);
@ -494,6 +473,19 @@ void GaleraMonitor::main()
store_server_journal(m_monitor, NULL);
release_monitor_servers(m_monitor);
/** Sleep until the next monitoring interval */
unsigned int ms = 0;
while (ms < m_monitor->interval && !m_shutdown)
{
if (m_monitor->server_pending_changes)
{
// Admin has changed something, skip sleep
break;
}
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
ms += MXS_MON_BASE_INTERVAL_MS;
}
}
}

32
server/modules/monitor/mmmon/mmmon.cc
View File

@ -441,29 +441,10 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITORED_SERVER *database)
*/
void MMMonitor::main()
{
size_t nrounds = 0;
load_server_journal(m_monitor, &m_master);
while (!m_shutdown)
{
/** Wait base interval */
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
/**
* Calculate how far away the monitor interval is from its full
* cycle and if monitor interval time further than the base
* interval, then skip monitoring checks. Excluding the first
* round.
*/
if (nrounds != 0 &&
(((nrounds * MXS_MON_BASE_INTERVAL_MS) % m_monitor->interval) >=
MXS_MON_BASE_INTERVAL_MS) && (!m_monitor->server_pending_changes))
{
nrounds += 1;
continue;
}
nrounds += 1;
lock_monitor_servers(m_monitor);
servers_status_pending_to_current(m_monitor);
@ -479,6 +460,19 @@ void MMMonitor::main()
servers_status_current_to_pending(m_monitor);
store_server_journal(m_monitor, m_master);
release_monitor_servers(m_monitor);
/** Sleep until the next monitoring interval */
unsigned int ms = 0;
while (ms < m_monitor->interval && !m_shutdown)
{
if (m_monitor->server_pending_changes)
{
// Admin has changed something, skip sleep
break;
}
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
ms += MXS_MON_BASE_INTERVAL_MS;
}
}
}

32
server/modules/monitor/ndbclustermon/ndbclustermon.cc
View File

@ -246,29 +246,10 @@ monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *default
*/
void NDBCMonitor::main()
{
size_t nrounds = 0;
load_server_journal(m_monitor, NULL);
while (!m_shutdown)
{
/** Wait base interval */
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
/**
* Calculate how far away the monitor interval is from its full
* cycle and if monitor interval time further than the base
* interval, then skip monitoring checks. Excluding the first
* round.
*/
if (nrounds != 0 &&
((nrounds * MXS_MON_BASE_INTERVAL_MS) % m_monitor->interval) >=
MXS_MON_BASE_INTERVAL_MS)
{
nrounds += 1;
continue;
}
nrounds += 1;
lock_monitor_servers(m_monitor);
servers_status_pending_to_current(m_monitor);
@ -284,6 +265,19 @@ void NDBCMonitor::main()
servers_status_current_to_pending(m_monitor);
store_server_journal(m_monitor, NULL);
release_monitor_servers(m_monitor);
/** Sleep until the next monitoring interval */
unsigned int ms = 0;
while (ms < m_monitor->interval && !m_shutdown)
{
if (m_monitor->server_pending_changes)
{
// Admin has changed something, skip sleep
break;
}
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
ms += MXS_MON_BASE_INTERVAL_MS;
}
}
}