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

Measure monitor loop execution time when calculating sleep time

Browse Source
This commit is contained in:
Esa Korhonen
2018-06-07 10:53:07 +03:00
parent 96ed651466
commit d0453bd3ed
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/core/monitor.cc
View File

@ -2927,6 +2927,9 @@ void MonitorInstance::main()
while (!m_shutdown)
{
/* Measure the time of monitor loop execution. */
int64_t loop_start_ms = get_time_ms();
monitor_check_maintenance_requests(m_monitor);
tick();
@ -2938,24 +2941,34 @@ void MonitorInstance::main()
mon_hangup_failed_servers(m_monitor);
store_server_journal(m_monitor, m_master);
/** Sleep until the next monitoring interval */
unsigned int ms = 0;
while (ms < m_monitor->interval && !m_shutdown)
{
if (atomic_load_int(&m_monitor->check_maintenance_flag) != MAINTENANCE_FLAG_NOCHECK)
{
// Admin has changed something, skip sleep
break;
}
thread_millisleep(MXS_MON_BASE_INTERVAL_MS);
ms += MXS_MON_BASE_INTERVAL_MS;
}
sleep_until_next_tick(loop_start_ms);
}
post_loop();
}
/**
* Sleep until the next monitor tick
*
* @param tick_start_ms When was the latest tick started
*/
void MonitorInstance::sleep_until_next_tick(int64_t tick_start_ms)
{
// Check how much the monitor should sleep to get one full monitor interval.
int64_t sleep_time_remaining = m_monitor->interval - (get_time_ms() - tick_start_ms);
// Sleep at least one base interval.
sleep_time_remaining = MXS_MAX(MXS_MON_BASE_INTERVAL_MS, sleep_time_remaining);
/* Sleep in small increments to react fast to changes. */
while (sleep_time_remaining > 0 && !should_shutdown() &&
atomic_load_int(&m_monitor->check_maintenance_flag) == MAINTENANCE_FLAG_NOCHECK)
{
int small_sleep_ms = (sleep_time_remaining >= MXS_MON_BASE_INTERVAL_MS) ?
MXS_MON_BASE_INTERVAL_MS : sleep_time_remaining;
thread_millisleep(small_sleep_ms);
sleep_time_remaining -= small_sleep_ms;
}
}
//static
void MonitorInstance::main(void* pArg)
{