modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit 61f2d882d8c614c5635f875fbe6c37e58032bb0b Author: John Mazzitelli mazz@redhat.com Date: Thu Nov 3 20:45:24 2011 -0400
[BZ 751231] delay the initial collection to avoid missing it the first time through
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java index cd00e4a..c019cde 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java @@ -372,6 +372,12 @@ public class MeasurementManager extends AgentService implements MeasurementAgent // This ensures that all the schedules for a single resource start at the same time // This will enable them to be collected at the same time long firstCollection = System.currentTimeMillis(); + // see BZ 751231 for why we delay the first collection + if (configuration != null) { + firstCollection += (configuration.getMeasurementCollectionInitialDelay() * 1000L); + } else { + firstCollection += 30000L; + }
for (MeasurementScheduleRequest request : requests) { ScheduledMeasurementInfo info = new ScheduledMeasurementInfo(request, resourceId);