Author: scottmf
Date: 2010-03-31 00:36:14 -0700 (Wed, 31 Mar 2010)
New Revision: 14451
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14451
Modified:
trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
Log:
[HHQ-3853] [HHQ-3850] fixed scehduling issues
Modified: trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java 2010-03-31 02:00:31 UTC (rev 14450)
+++ trunk/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java 2010-03-31 07:36:14 UTC (rev 14451)
@@ -259,6 +259,8 @@
super.checkModifyPermission(subject.getId(), id);
List dmList = createMeasurements(id, templates, intervals, props);
+ ZeventManager.getInstance().enqueueEventAfterCommit(
+ new AgentScheduleSyncZevent(Collections.singletonList(id)));
return dmList;
}
@@ -1441,11 +1443,15 @@
}
boolean isCreate = z instanceof ResourceCreatedZevent;
- boolean isRefresh =
- z instanceof ResourceRefreshZevent || z instanceof ResourceUpdatedZevent;
+ boolean isRefresh = z instanceof ResourceRefreshZevent;
+ boolean isUpdate = z instanceof ResourceUpdatedZevent;
try {
// Handle reschedules for when agents are updated.
+ if (isUpdate) {
+ if (debug) log.debug("Refreshing metric schedule for [" + id + "]");
+ eids.add(id);
+ }
if (isRefresh) {
if (debug) log.debug("Refreshing metric schedule for [" + id + "]");
eids.add(id);
@@ -1476,7 +1482,7 @@
}
} catch (ConfigFetchException e) {
- log.debug("Config not set for [" + id + "]", e);
+ log.warn("Config not set for [" + id + "] (this is usually ok): " + e);
} catch(Exception e) {
log.warn("Unable to enable default metrics for [" + id + "]", e);
}
|