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

Merge branch 'release-1.0beta-refresh' of github.com:skysql/MaxScale into release-1.0beta-refresh

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-24 11:14:10 +01:00
parent f3429dac1b 315b5b92df
commit 7da4aa1400
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/monitor/galera_mon.c
View File

@ -447,10 +447,15 @@ size_t nrounds = 0;
} }
/** Wait base interval */ /** Wait base interval */
thread_millisleep(MON_BASE_INTERVAL_MS); thread_millisleep(MON_BASE_INTERVAL_MS);
/**
/** If monitor interval time isn't consumed skip checks */ * Calculate how far away the monitor interval is from its full
if (nrounds != 0 && * cycle and if monitor interval time further than the base
(nrounds*MON_BASE_INTERVAL_MS)%handle->interval != 0) * interval, then skip monitoring checks. Excluding the first
* round.
*/
if (nrounds != 0 &&
((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) >
MON_BASE_INTERVAL_MS)
{ {
nrounds += 1; nrounds += 1;
continue; continue;

13
server/modules/monitor/mysql_mon.c
View File

@ -611,10 +611,15 @@ size_t nrounds = 0;
} }
/** Wait base interval */ /** Wait base interval */
thread_millisleep(MON_BASE_INTERVAL_MS); thread_millisleep(MON_BASE_INTERVAL_MS);
/**
/** If monitor interval time isn't consumed skip checks */ * Calculate how far away the monitor interval is from its full
if (nrounds != 0 && * cycle and if monitor interval time further than the base
(nrounds*MON_BASE_INTERVAL_MS)%handle->interval != 0) * interval, then skip monitoring checks. Excluding the first
* round.
*/
if (nrounds != 0 &&
((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) >
MON_BASE_INTERVAL_MS)
{ {
nrounds += 1; nrounds += 1;
continue; continue;

13
server/modules/monitor/ndbcluster_mon.c
View File

@ -445,10 +445,15 @@ size_t nrounds = 0;
/** Wait base interval */ /** Wait base interval */
thread_millisleep(MON_BASE_INTERVAL_MS); thread_millisleep(MON_BASE_INTERVAL_MS);
/**
/** If monitor interval time isn't consumed skip checks */ * Calculate how far away the monitor interval is from its full
if (nrounds != 0 && * cycle and if monitor interval time further than the base
(nrounds*MON_BASE_INTERVAL_MS)%handle->interval != 0) * interval, then skip monitoring checks. Excluding the first
* round.
*/
if (nrounds != 0 &&
((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) >
MON_BASE_INTERVAL_MS)
{ {
nrounds += 1; nrounds += 1;
continue; continue;