Menu
▾
▴
hyperic-hq-discuss — Hyperic HQ SVN Commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(927) |
Apr
(419) |
May
(352) |
Jun
(431) |
Jul
(463) |
Aug
(345) |
Sep
(304) |
Oct
(596) |
Nov
(466) |
Dec
(414) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(348) |
Feb
(313) |
Mar
(665) |
Apr
(688) |
May
(434) |
Jun
(311) |
Jul
(540) |
Aug
(554) |
Sep
(467) |
Oct
(341) |
Nov
(365) |
Dec
(272) |
| 2009 |
Jan
(386) |
Feb
(293) |
Mar
(279) |
Apr
(239) |
May
(229) |
Jun
(199) |
Jul
(186) |
Aug
(111) |
Sep
(196) |
Oct
(146) |
Nov
(116) |
Dec
(140) |
| 2010 |
Jan
(170) |
Feb
(159) |
Mar
(151) |
Apr
(161) |
May
(90) |
Jun
(56) |
Jul
(28) |
Aug
(22) |
Sep
(5) |
Oct
|
Nov
(23) |
Dec
(12) |
| 2011 |
Jan
(8) |
Feb
(8) |
Mar
(22) |
Apr
(24) |
May
(4) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2012 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <dcr...@hy...> - 2010-03-24 00:42:05
|
Author: dcrutchf Date: 2010-03-23 17:41:56 -0700 (Tue, 23 Mar 2010) New Revision: 14413 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14413 Modified: trunk/web/common/Head.jsp Log: added a couple require calls Modified: trunk/web/common/Head.jsp =================================================================== --- trunk/web/common/Head.jsp 2010-03-23 08:00:36 UTC (rev 14412) +++ trunk/web/common/Head.jsp 2010-03-24 00:41:56 UTC (rev 14413) @@ -63,6 +63,8 @@ <script type="text/javascript"> var imagePath = "<html:rewrite page="/images/"/>"; dojo11.require('dojo.date'); + dojo.require('dojo.event.*'); + dojo.require('dojo.widget.*'); </script> <script src="<html:rewrite page='/js/prototype.js'/>" type="text/javascript"></script> <script src="<html:rewrite page='/js/popup.js'/>" type="text/javascript"></script> |
|
From: <bo...@hy...> - 2010-03-23 08:00:45
|
Author: bob Date: 2010-03-23 01:00:36 -0700 (Tue, 23 Mar 2010) New Revision: 14412 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14412 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1386 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-23 03:50:59 UTC (rev 14411) +++ trunk/etc/version.properties 2010-03-23 08:00:36 UTC (rev 14412) @@ -1,3 +1,3 @@ -#Mon Mar 22 00:19:08 PDT 2010 +#Tue Mar 23 00:22:14 PDT 2010 version=4.3.0 -build=1385 +build=1386 |
|
From: <dcr...@hy...> - 2010-03-23 03:51:06
|
Author: dcrutchf Date: 2010-03-22 20:50:59 -0700 (Mon, 22 Mar 2010) New Revision: 14411 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14411 Modified: trunk/web/WEB-INF/jsp/login.jsp trunk/web/common/Head.jsp trunk/web/portal/PortletLayout.jsp trunk/web/resource/common/monitor/visibility/DashCharts.jsp Log: patched dojo (part 5 - final) Modified: trunk/web/WEB-INF/jsp/login.jsp =================================================================== --- trunk/web/WEB-INF/jsp/login.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/WEB-INF/jsp/login.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -68,7 +68,7 @@ </form> </div> </div> - <script src="<html:rewrite page="/js/dojo/1.1/dojo/dojo.js" />" type="text/javascript"></script> + <script src="<html:rewrite page="/js/dojo/1.1.2/dojo/dojo.js" />" type="text/javascript"></script> <script> dojo.addOnLoad(function() { var username = dojo.byId("usernameInput"); Modified: trunk/web/common/Head.jsp =================================================================== --- trunk/web/common/Head.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/common/Head.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --%> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dojo/resources/dojo.css"/>" type="text/css"/> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dijit/themes/tundra/tundra.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dojo/resources/dojo.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css"/>" type="text/css"/> <link rel="shortcut icon" href="<html:rewrite page="/images/4.0/icons/favicon.ico"/>"/> <link rel="stylesheet" href="<html:rewrite page="/css/win.css"/>" type="text/css"/> <link rel="stylesheet" href="<html:rewrite page="/css/HQ_40.css"/>" type="text/css"/> @@ -49,17 +49,17 @@ <script type="text/javascript"> djConfig = { isDebug: false, locale: 'en-us' } </script> -<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.3/dojo.js'/>"></script> +<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.4/dojo.js'/>"></script> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="<html:rewrite page='/js/dojo/1.1/dojo/dojo.js'/>" type="text/javascript"></script> +<script src="<html:rewrite page='/js/dojo/1.1.2/dojo/dojo.js'/>" type="text/javascript"></script> <script type="text/javascript"> var imagePath = "<html:rewrite page="/images/"/>"; dojo11.require('dojo.date'); Modified: trunk/web/portal/PortletLayout.jsp =================================================================== --- trunk/web/portal/PortletLayout.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/portal/PortletLayout.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -29,8 +29,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --%> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dojo/resources/dojo.css"/>" type="text/css"/> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dijit/themes/tundra/tundra.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dojo/resources/dojo.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css"/>" type="text/css"/> <link rel="shortcut icon" href="<html:rewrite page="/images/4.0/icons/favicon.ico"/>"/> <link rel="stylesheet" href="<html:rewrite page="/css/win.css"/>" type="text/css"/> <link rel="stylesheet" href="<html:rewrite page="/css/HQ_40.css"/>" type="text/css"/> @@ -50,17 +50,17 @@ <script type="text/javascript"> djConfig = { isDebug: false, locale: 'en-us' } </script> -<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.3/dojo.js'/>"></script> +<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.4/dojo.js'/>"></script> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="<html:rewrite page='/js/dojo/1.1/dojo/dojo.js'/>" type="text/javascript"></script> +<script src="<html:rewrite page='/js/dojo/1.1.2/dojo/dojo.js'/>" type="text/javascript"></script> <script type="text/javascript"> var imagePath = "<html:rewrite page="/images/"/>"; dojo11.require('dojo.date'); Modified: trunk/web/resource/common/monitor/visibility/DashCharts.jsp =================================================================== --- trunk/web/resource/common/monitor/visibility/DashCharts.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/resource/common/monitor/visibility/DashCharts.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -50,7 +50,7 @@ <META Http-Equiv="Pragma" Content="no-cache"> <META Http-Equiv="Expires" Content="0"> -<script src="<html:rewrite page='/js/dojo/1.1/dojo/dojo.js'/>" type="text/javascript"></script> +<script src="<html:rewrite page='/js/dojo/1.1.2/dojo/dojo.js'/>" type="text/javascript"></script> <script src="<html:rewrite page="/js/functions.js"/>" type="text/javascript"></script> <script src="<html:rewrite page="/js/prototype.js"/>" type="text/javascript"></script> <script src="<html:rewrite page="/js/effects.js"/>" type="text/javascript"></script> |
|
From: <dcr...@hy...> - 2010-03-23 03:49:01
|
Author: dcrutchf Date: 2010-03-22 20:48:52 -0700 (Mon, 22 Mar 2010) New Revision: 14410 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14410 Removed: trunk/web/js/dojo/1.1/ Log: patched dojo (part 4) |
|
From: <dcr...@hy...> - 2010-03-23 02:30:11
|
Author: dcrutchf Date: 2010-03-22 19:30:00 -0700 (Mon, 22 Mar 2010) New Revision: 14409 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14409 Removed: trunk/web/js/dojo/0.4.3/ Log: patched dojo (part 3) |
|
From: <pn...@hy...> - 2010-03-23 00:35:45
|
Author: pnguyen Date: 2010-03-22 17:35:36 -0700 (Mon, 22 Mar 2010) New Revision: 14406 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14406 Modified: trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java Log: [HHQ-3597] Implement PagerProcessorExt so that the Pager can skip nulls Modified: trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java 2010-03-22 18:21:07 UTC (rev 14405) +++ trunk/src/org/hyperic/hq/events/server/session/PagerProcessor_events.java 2010-03-23 00:35:36 UTC (rev 14406) @@ -31,16 +31,25 @@ import org.hyperic.hq.common.SystemException; import org.hyperic.hq.escalation.server.session.EscalationManagerEJBImpl; import org.hyperic.hq.events.shared.AlertValue; -import org.hyperic.util.pager.PagerProcessor; +import org.hyperic.util.pager.PagerEventHandler; +import org.hyperic.util.pager.PagerProcessorExt; -public class PagerProcessor_events implements PagerProcessor { +public class PagerProcessor_events implements PagerProcessorExt { private static final Log log = LogFactory.getLog(PagerProcessor_events.class); - public PagerProcessor_events () {} + public PagerProcessor_events() {} - public Object processElement (Object o) { + public PagerEventHandler getEventHandler() { + return null; + } + public boolean skipNulls() { + return true; + } + + public Object processElement(Object o) { + if (o == null) { return null; } @@ -69,4 +78,8 @@ return o; } + + public Object processElement(Object o1, Object o2) { + return processElement(o1); + } } |
|
From: <rm...@hy...> - 2010-03-22 18:21:15
|
Author: rmorgan Date: 2010-03-22 11:21:07 -0700 (Mon, 22 Mar 2010) New Revision: 14405 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14405 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Bump to 4.2.0.7 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-03-22 17:41:03 UTC (rev 14404) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-03-22 18:21:07 UTC (rev 14405) @@ -1,3 +1,3 @@ #Thu Mar 18 10:09:47 PDT 2010 -version=4.2.0.6 +version=4.2.0.7 build=1283 |
|
From: <pn...@hy...> - 2010-03-22 17:41:12
|
Author: pnguyen Date: 2010-03-22 10:41:03 -0700 (Mon, 22 Mar 2010) New Revision: 14404 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14404 Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java Log: [HQ-2030] Add more informational debug statements Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java 2010-03-22 07:58:45 UTC (rev 14403) +++ trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java 2010-03-22 17:41:03 UTC (rev 14404) @@ -755,27 +755,17 @@ _createMap = new HashMap(); _removeMap = new HashMap(); final boolean debug = _log.isDebugEnabled(); - long begin = -1; Map state = null; synchronized (cache) { try { cache.beginTran(); - begin = getDebugTime(debug); updateCache(availPoints, updateList, outOfOrderAvail); - debugTimes(begin, "updateCache", availPoints.size()); - begin = getDebugTime(debug); setCurrAvails(outOfOrderAvail, updateList); - debugTimes(begin, "setCurrAvails", - outOfOrderAvail.size() + updateList.size()); state = captureCurrAvailState(); - begin = getDebugTime(debug); updateStates(updateList); - debugTimes(begin, "updateStates", updateList.size()); - begin = getDebugTime(debug); updateOutOfOrderState(outOfOrderAvail); flushCreateAndRemoves(); logErrorInfo(state, availPoints); - debugTimes(begin, "updateOutOfOrderState", outOfOrderAvail.size()); cache.commitTran(); } catch (Throwable e) { logErrorInfo(state, availPoints); @@ -791,13 +781,15 @@ ConcurrentStatsCollector.getInstance().addStat( availPoints.size(), AVAIL_MANAGER_METRICS_INSERTED); if (sendData) { - begin = getDebugTime(debug); sendDataToEventHandlers(availPoints); - debugTimes(begin, "sendDataToEventHandlers", availPoints.size()); } } private void flushCreateAndRemoves() { + final StopWatch watch = new StopWatch(); + final boolean debug = _log.isDebugEnabled(); + + if (debug) watch.markTimeBegin("remove"); for (Iterator it=_removeMap.entrySet().iterator(); it.hasNext(); ) { Map.Entry entry = (Map.Entry)it.next(); AvailabilityDataRLE rle = (AvailabilityDataRLE)entry.getValue(); @@ -810,12 +802,23 @@ _dao.remove(rle); } } + if (debug) { + watch.markTimeEnd("remove"); + watch.markTimeBegin("flush"); + } + // addData() could be overwriting RLE data points (i.e. from 0.0 to 1.0) // with the same ID. If this is the scenario, then we must run // flush() in order to ensure that these old objects are not in the // session when the equivalent create() on the same ID is run, // thus avoiding NonUniqueObjectExceptions _dao.getSession().flush(); + + if (debug) { + watch.markTimeEnd("flush"); + watch.markTimeBegin("create"); + } + for (Iterator it=_createMap.entrySet().iterator(); it.hasNext(); ) { Map.Entry entry = (Map.Entry)it.next(); AvailabilityDataRLE rle = (AvailabilityDataRLE)entry.getValue(); @@ -825,24 +828,16 @@ _dao.create(rle.getMeasurement(), rle.getStartime(), rle.getEndtime(), rle.getAvailVal()); } - } - - private long getDebugTime(final boolean debug) { + if (debug) { - return System.currentTimeMillis(); + watch.markTimeEnd("create"); + _log.debug("AvailabilityInserter flushCreateAndRemoves: " + watch + + ", points {remove=" + _removeMap.size() + + ", create=" + _createMap.size() + + "}"); } - return -1; } - private void debugTimes(final long begin, final String name, - final int points) { - if (_log.isDebugEnabled()) { - long time = System.currentTimeMillis() - begin; - _log.debug("AvailabilityInserter time to " + name + " -> " - + time + " ms, points: " + points); - } - } - private void logErrorInfo(final Map oldState, final List availPoints) { if (!_traceLog.isDebugEnabled()) { return; @@ -860,20 +855,29 @@ private void setCurrAvails(final List outOfOrderAvail, final List updateList) { - if (outOfOrderAvail.size() == 0 && updateList.size() == 0) { - _currAvails = Collections.EMPTY_MAP; - return; + + final StopWatch watch = new StopWatch(); + try { + if (outOfOrderAvail.size() == 0 && updateList.size() == 0) { + _currAvails = Collections.EMPTY_MAP; + return; + } + long now = TimingVoodoo.roundDownTime(System.currentTimeMillis(), 60000); + HashSet mids = getMidsWithinAllowedDataWindow(updateList, now); + mids.addAll(getMidsWithinAllowedDataWindow(outOfOrderAvail, now)); + if (mids.size() <= 0) { + _currAvails = Collections.EMPTY_MAP; + return; + } + Integer[] mIds = (Integer[])mids.toArray(new Integer[0]); + _currAvails = _dao.getHistoricalAvailMap( + mIds, now-MAX_DATA_BACKLOG_TIME, false); + } finally { + if (_log.isDebugEnabled()) { + _log.debug("AvailabilityInserter setCurrAvails: " + watch + + ", size=" + _currAvails.size()); + } } - long now = TimingVoodoo.roundDownTime(System.currentTimeMillis(), 60000); - HashSet mids = getMidsWithinAllowedDataWindow(updateList, now); - mids.addAll(getMidsWithinAllowedDataWindow(outOfOrderAvail, now)); - if (mids.size() <= 0) { - _currAvails = Collections.EMPTY_MAP; - return; - } - Integer[] mIds = (Integer[])mids.toArray(new Integer[0]); - _currAvails = _dao.getHistoricalAvailMap( - mIds, now-MAX_DATA_BACKLOG_TIME, false); } private HashSet getMidsWithinAllowedDataWindow(final List states, @@ -1247,7 +1251,9 @@ } // as a performance optimization, fetch all the last avails // at once, rather than one at a time in updateState() + final StopWatch watch = new StopWatch(); final boolean debug = _log.isDebugEnabled(); + int numUpdates = 0; for (Iterator i=states.iterator(); i.hasNext(); ) { DataPoint state = (DataPoint)i.next(); try { @@ -1265,26 +1271,45 @@ } if (updateCache) { cache.put(state.getMetricId(), state); + numUpdates++; } } catch (BadAvailStateException e) { _log.warn(e.getMessage()); } } + if (debug) { + _log.debug("AvailabilityInserter updateStates: " + watch + + ", points {total=" + states.size() + + ", updateCache=" + numUpdates + + "}"); + } } private void updateOutOfOrderState(List outOfOrderAvail) { if (outOfOrderAvail.size() == 0) { return; } + + final StopWatch watch = new StopWatch(); + int numBadAvailState = 0; + for (Iterator i=outOfOrderAvail.iterator(); i.hasNext(); ) { try { DataPoint state = (DataPoint)i.next(); // do not update the cache here, the timestamp is out of order merge(state); } catch (BadAvailStateException e) { + numBadAvailState++; _log.warn(e.getMessage()); } } + + if (_log.isDebugEnabled()) { + _log.debug("AvailabilityInserter updateOutOfOrderState: " + watch + + ", points {total=" + outOfOrderAvail.size() + + ", badAvailState=" + numBadAvailState + + "}"); + } } private void updateCache(List availPoints, List updateList, @@ -1294,6 +1319,7 @@ return; } AvailabilityCache cache = AvailabilityCache.getInstance(); + final StopWatch watch = new StopWatch(); final boolean debug = _log.isDebugEnabled(); for (Iterator i=availPoints.iterator(); i.hasNext(); ) { DataPoint pt = (DataPoint)i.next(); @@ -1313,19 +1339,30 @@ oldState.getValue() != val) { updateList.add(newState); if (debug) { - String msg = "value of state " + newState + - " differs from" + " current value" + + String msg = "value of state[" + newState + + "] differs from current value[" + ((oldState != null) ? oldState.toString() : - " old state does not exist"); + "old state does not exist") + "]"; _log.debug(msg); } } else { cache.put(new Integer(id), newState); } } + if (debug) { + _log.debug("AvailabilityInserter updateCache: " + watch + + ", points {total=" + availPoints.size() + + ", outOfOrder=" + outOfOrderAvail.size() + + ", updateToDb=" + updateList.size() + + ", updateCacheTimestamp=" + + (availPoints.size() - outOfOrderAvail.size() - updateList.size()) + + "}"); + } } private void sendDataToEventHandlers(List data) { + final StopWatch watch = new StopWatch(); + final boolean debug = _log.isDebugEnabled(); int maxCapacity = data.size(); ArrayList events = new ArrayList(maxCapacity); Map downEvents = new HashMap(maxCapacity); @@ -1335,8 +1372,7 @@ final boolean allEventsInteresting = Boolean.getBoolean(ALL_EVENTS_INTERESTING_PROP); - final StopWatch watch = new StopWatch(); - final boolean debug = _log.isDebugEnabled(); + if (debug) watch.markTimeBegin("isTriggerInterested"); for (Iterator i = data.iterator(); i.hasNext();) { DataPoint dp = (DataPoint) i.next(); Integer metricId = dp.getMetricId(); @@ -1344,10 +1380,8 @@ MeasurementEvent event = new MeasurementEvent(metricId, val); - if (debug) watch.markTimeBegin("isTriggerInterested"); boolean isEventInteresting = allEventsInteresting || RegisteredTriggers.isTriggerInterested(event); - if (debug) watch.markTimeEnd("isTriggerInterested"); if (isEventInteresting) { measMan.buildMeasurementEvent(event); if (event.getValue().getValue() == AVAIL_DOWN) { @@ -1362,13 +1396,16 @@ zevents.add(new MeasurementZevent(metricId.intValue(), val)); } + if (debug) watch.markTimeEnd("isTriggerInterested"); if (!downEvents.isEmpty()) { + if (debug) watch.markTimeBegin("suppressMeasurementEvents"); // Determine whether the measurement events can // be suppressed as part of hierarchical alerting PermissionManagerFactory.getInstance() .getHierarchicalAlertingManager() .suppressMeasurementEvents(downEvents, true); + if (debug) watch.markTimeEnd("suppressMeasurementEvents"); if (!downEvents.isEmpty()) { events.addAll(downEvents.values()); @@ -1383,6 +1420,15 @@ if (!zevents.isEmpty()) { ZeventManager.getInstance().enqueueEventsAfterCommit(zevents); } + + if (debug) { + _log.debug("AvailabilityInserter sendDataToEventHandlers: " + watch + + ", points {total=" + maxCapacity + + ", downEvents=" + downEvents.size() + + ", eventsToPublish=" + events.size() + + ", zeventsToEnqueue=" + zevents.size() + + "}"); + } } /** Modified: trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java 2010-03-22 07:58:45 UTC (rev 14403) +++ trunk/src/org/hyperic/hq/measurement/server/session/ReportProcessorEJBImpl.java 2010-03-22 17:41:03 UTC (rev 14404) @@ -179,11 +179,10 @@ final MeasurementManagerLocal mMan = MeasurementManagerEJBImpl.getOne(); final boolean debug = _log.isDebugEnabled(); final StopWatch watch = new StopWatch(); + if (debug) watch.markTimeBegin("verifyAndAddData"); for (int i = 0; i < dsnLists.length; i++) { Integer dmId = new Integer(dsnLists[i].getClientId()); - if (debug) watch.markTimeBegin("getMeasurement"); Measurement m = mMan.getMeasurement(dmId); - if (debug) watch.markTimeEnd("getMeasurement"); // Can't do much if we can't look up the derived measurement // If the measurement is enabled, we just throw away their data @@ -192,12 +191,19 @@ // points for. This is still a problem for people who change their // collection period, but the instances should be low. if (m == null || !m.isEnabled()) { + if (debug) { + if (m == null) { + _log.debug("dropping metricId=" + dmId + + " because measurement is null"); + } else { + _log.debug("dropping metricId=" + dmId + + " because measurement is disabled"); + } + } continue; } // Need to check if resource was asynchronously deleted (type == null) - if (debug) watch.markTimeBegin("getResource"); final Resource res = m.getResource(); - if (debug) watch.markTimeEnd("getResource"); if (res == null || res.isInAsyncDeleteState()) { if (debug) { _log.debug("dropping metricId=" + m.getId() + @@ -205,20 +211,16 @@ } continue; } - if (debug) watch.markTimeBegin("resMatchesAgent"); if (!resourceMatchesAgent(res, agentToken)) { _log.warn("measurement (id=" + m.getId() + ") was sent to the " + "HQ server from agent (agentToken=" + agentToken + ")" + " but resource (id=" + res.getId() + ") is not associated " + " with that agent. Dropping measurement."); - if (debug) watch.markTimeEnd("resMatchesAgent"); continue; } - if (debug) watch.markTimeEnd("resMatchesAgent"); final boolean isAvail = m.getTemplate().isAvailability(); final ValueList[] valLists = dsnLists[i].getDsns(); - if (debug) watch.markTimeBegin("addData"); for (int j = 0; j < valLists.length; j++) { final MetricValue[] vals = valLists[j].getValues(); if (isAvail) { @@ -227,9 +229,18 @@ addData(dataPoints, null, m, vals); } } - if (debug) watch.markTimeEnd("addData"); } - if (debug) _log.debug(watch); + if (debug) { + watch.markTimeEnd("verifyAndAddData"); + _log.debug("received " + + dsnLists.length + + " metrics, processing " + + dataPoints.size() + " data points, " + + availPoints.size() + " avail points, " + + priorityAvailPts.size() + + " priority avail points from agent with token " + + agentToken); + } DataInserter d = MeasurementStartupListener.getDataInserter(); if (debug) watch.markTimeBegin("sendMetricDataToDB"); @@ -261,6 +272,7 @@ StringUtil.arrayToString(entIds)); } } + if (debug) _log.debug("handleMeasurementReport: " + watch); } /** |
|
From: <bo...@hy...> - 2010-03-22 07:58:54
|
Author: bob Date: 2010-03-22 00:58:45 -0700 (Mon, 22 Mar 2010) New Revision: 14403 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14403 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1385 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-22 05:16:57 UTC (rev 14402) +++ trunk/etc/version.properties 2010-03-22 07:58:45 UTC (rev 14403) @@ -1,3 +1,3 @@ -#Sun Mar 21 00:21:46 PDT 2010 +#Mon Mar 22 00:19:08 PDT 2010 version=4.3.0 -build=1384 +build=1385 |
|
From: <sc...@hy...> - 2010-03-22 05:17:08
|
Author: scottmf Date: 2010-03-21 22:16:57 -0700 (Sun, 21 Mar 2010) New Revision: 14402 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14402 Modified: trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java trunk/src/org/hyperic/hq/events/server/session/AlertConditionsSatisfiedListener.java trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java Log: [HHQ-3798] put fireAlert() in a session runner to ensure that there is one session per event to try and avoid the zevent queue from getting backed up. Added stat collection around this area to try to expose the bottlenecks if this should occur again. Modified: trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java 2010-03-21 07:54:51 UTC (rev 14401) +++ trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java 2010-03-22 05:16:57 UTC (rev 14402) @@ -95,8 +95,8 @@ // stats on a deployment's activity private static final long EVALUATION_PERIOD = ConcurrentStatsCollector.WRITE_PERIOD*1000; - private static final String EMAIL_ACTIONS = - ConcurrentStatsCollector.EMAIL_ACTIONS; + private static final String SEND_ALERT_TIME = + ConcurrentStatsCollector.SEND_ALERT_TIME; // evaluation window to continue and block notifications or // toggle back to regular operation private static final int THRESHOLD_WINDOW = 10*60*1000; @@ -394,7 +394,7 @@ EmailRecipient[] to, String subject, String[] body, String[] htmlBody, int priority, boolean notifyFiltered) { - ConcurrentStatsCollector.getInstance().addStat(1, EMAIL_ACTIONS); + final long start = System.currentTimeMillis(); if (_alertThreshold <= 0) { final boolean debug = _log.isDebugEnabled(); if (debug) { @@ -411,6 +411,8 @@ _emails.add(obj); } } + ConcurrentStatsCollector.getInstance().addStat( + System.currentTimeMillis()-start, SEND_ALERT_TIME); } private static final EmailManagerLocal getEmailMan() { Modified: trunk/src/org/hyperic/hq/events/server/session/AlertConditionsSatisfiedListener.java =================================================================== --- trunk/src/org/hyperic/hq/events/server/session/AlertConditionsSatisfiedListener.java 2010-03-21 07:54:51 UTC (rev 14401) +++ trunk/src/org/hyperic/hq/events/server/session/AlertConditionsSatisfiedListener.java 2010-03-22 05:16:57 UTC (rev 14402) @@ -7,8 +7,11 @@ import org.apache.commons.logging.LogFactory; import org.hyperic.hibernate.Util; import org.hyperic.hq.events.shared.AlertManagerLocal; +import org.hyperic.hq.hibernate.SessionManager; +import org.hyperic.hq.hibernate.SessionManager.SessionRunner; import org.hyperic.hq.measurement.server.session.AlertConditionsSatisfiedZEvent; import org.hyperic.hq.zevents.ZeventListener; +import org.hyperic.util.stats.ConcurrentStatsCollector; /** * Receives AlertConditionSatisfiedZEvents and forwards them to the AlertManager @@ -22,20 +25,28 @@ private final Log _log = LogFactory.getLog(AlertConditionsSatisfiedListener.class); public void processEvents(List events) { - AlertManagerLocal am = AlertManagerEJBImpl.getOne(); + final AlertManagerLocal am = AlertManagerEJBImpl.getOne(); for (Iterator it=events.iterator(); it.hasNext(); ) { - AlertConditionsSatisfiedZEvent z = (AlertConditionsSatisfiedZEvent)it.next(); + final AlertConditionsSatisfiedZEvent z = (AlertConditionsSatisfiedZEvent)it.next(); + final long start = System.currentTimeMillis(); // HQ-1905 need to retry due to potential StaleStateExceptions for (int ii=0; ii<MAX_RETRIES; ii++) { try { - am.fireAlert(z); + SessionManager.runInSession(new SessionRunner() { + public String getName() { + return "AlertConditionSatifiedListener"; + } + public void run() throws Exception { + am.fireAlert(z); + } + }); break; } catch (Throwable e) { if ((ii+1) < MAX_RETRIES && Util.tranRolledBack(e)) { String times = (MAX_RETRIES - ii == 1) ? "time" : "times"; _log.warn("Warning, exception occurred while running fireAlert. will retry " - + (MAX_RETRIES - (ii+1)) + " more " + times + ". errorMsg: " + e); + + (MAX_RETRIES - ii) + " more " + times + ". errorMsg: " + e); continue; } else { _log.error("fireAlert threw an Exception, will not be retried",e); @@ -43,6 +54,8 @@ } } } + ConcurrentStatsCollector.getInstance().addStat( + System.currentTimeMillis()-start, ConcurrentStatsCollector.FIRED_ALERT_TIME); } } Modified: trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java =================================================================== --- trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java 2010-03-21 07:54:51 UTC (rev 14401) +++ trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java 2010-03-22 05:16:57 UTC (rev 14402) @@ -276,11 +276,12 @@ c.register(ConcurrentStatsCollector.PURGE_EVENT_LOGS_TIME); c.register(ConcurrentStatsCollector.PURGE_MEASUREMENTS_TIME); c.register(ConcurrentStatsCollector.MEASUREMENT_SCHEDULE_TIME); - c.register(ConcurrentStatsCollector.EMAIL_ACTIONS); + c.register(ConcurrentStatsCollector.SEND_ALERT_TIME); c.register(ConcurrentStatsCollector.ZEVENT_QUEUE_SIZE); c.register(ConcurrentStatsCollector.FIRE_ALERT_TIME); c.register(ConcurrentStatsCollector.EVENT_PROCESSING_TIME); c.register(ConcurrentStatsCollector.TRIGGER_INIT_TIME); + c.register(ConcurrentStatsCollector.FIRED_ALERT_TIME); c.startCollector(); } catch (Exception e) { _log.error("Could not start Concurrent Stats Collector", e); Modified: trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java =================================================================== --- trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java 2010-03-21 07:54:51 UTC (rev 14401) +++ trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java 2010-03-22 05:16:57 UTC (rev 14402) @@ -106,9 +106,10 @@ PURGE_EVENT_LOGS_TIME = "PURGE_EVENT_LOGS_TIME", PURGE_MEASUREMENTS_TIME = "PURGE_MEASUREMENTS_TIME", MEASUREMENT_SCHEDULE_TIME = "MEASUREMENT_SCHEDULE_TIME", - EMAIL_ACTIONS = "EMAIL_ACTIONS", + SEND_ALERT_TIME = "SEND_ALERT_TIME", ZEVENT_QUEUE_SIZE = "ZEVENT_QUEUE_SIZE", - TRIGGER_INIT_TIME = "TRIGGER_INIT_TIME"; + TRIGGER_INIT_TIME = "TRIGGER_INIT_TIME", + FIRED_ALERT_TIME = "FIRED_ALERT_TIME"; // using tree due to ordering capabilities private final Map _statKeys = new TreeMap(); private AtomicBoolean _hasStarted = new AtomicBoolean(false); |
|
From: <bo...@hy...> - 2010-03-21 07:55:02
|
Author: bob Date: 2010-03-21 00:54:51 -0700 (Sun, 21 Mar 2010) New Revision: 14401 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14401 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1384 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-20 08:02:31 UTC (rev 14400) +++ trunk/etc/version.properties 2010-03-21 07:54:51 UTC (rev 14401) @@ -1,3 +1,3 @@ -#Sat Mar 20 00:23:19 PDT 2010 +#Sun Mar 21 00:21:46 PDT 2010 version=4.3.0 -build=1383 +build=1384 |
|
From: <bo...@hy...> - 2010-03-20 08:02:40
|
Author: bob Date: 2010-03-20 01:02:31 -0700 (Sat, 20 Mar 2010) New Revision: 14400 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14400 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1383 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-19 17:43:46 UTC (rev 14399) +++ trunk/etc/version.properties 2010-03-20 08:02:31 UTC (rev 14400) @@ -1,3 +1,3 @@ -#Fri Mar 19 00:21:13 PDT 2010 +#Sat Mar 20 00:23:19 PDT 2010 version=4.3.0 -build=1382 +build=1383 |
|
From: <bo...@hy...> - 2010-03-19 08:00:29
|
Author: bob Date: 2010-03-19 01:00:18 -0700 (Fri, 19 Mar 2010) New Revision: 14398 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14398 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1382 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-18 17:41:34 UTC (rev 14397) +++ trunk/etc/version.properties 2010-03-19 08:00:18 UTC (rev 14398) @@ -1,3 +1,3 @@ -#Thu Mar 18 00:18:59 PDT 2010 +#Fri Mar 19 00:21:13 PDT 2010 version=4.3.0 -build=1381 +build=1382 |
|
From: <bo...@hy...> - 2010-03-18 17:41:42
|
Author: bob Date: 2010-03-18 10:41:34 -0700 (Thu, 18 Mar 2010) New Revision: 14397 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14397 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.6 build #1283 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-03-18 16:38:12 UTC (rev 14396) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-03-18 17:41:34 UTC (rev 14397) @@ -1,3 +1,3 @@ -#Wed Mar 17 12:05:19 PDT 2010 +#Thu Mar 18 10:09:47 PDT 2010 version=4.2.0.6 -build=1282 +build=1283 |
|
From: <tr...@hy...> - 2010-03-18 16:38:21
|
Author: trader Date: 2010-03-18 09:38:12 -0700 (Thu, 18 Mar 2010) New Revision: 14396 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14396 Modified: branches/HQ_4_2_0_PATCH/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java Log: [No JIRA] Fix issue identified by tcServer team in naming Tomcat servers Modified: branches/HQ_4_2_0_PATCH/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java =================================================================== --- branches/HQ_4_2_0_PATCH/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-18 16:31:56 UTC (rev 14395) +++ branches/HQ_4_2_0_PATCH/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-18 16:38:12 UTC (rev 14396) @@ -23,17 +23,17 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.hyperic.hq.product.PluginException; -import org.hyperic.hq.product.ProductPlugin; import org.hyperic.hq.product.ServerResource; import org.hyperic.hq.product.Win32ControlPlugin; import org.hyperic.hq.product.jmx.MxServerDetector; import org.hyperic.hq.product.jmx.MxUtil; import org.hyperic.hq.product.jmx.MxServerDetector.MxProcess; -import org.hyperic.util.config.ConfigOption; +import org.hyperic.hq.product.pluginxml.PluginData; import org.hyperic.util.config.ConfigResponse; -import org.hyperic.util.config.ConfigSchema; import org.hyperic.sigar.win32.RegistryKey; import org.hyperic.sigar.win32.Win32Exception; @@ -168,18 +168,32 @@ if (!correctVersion) { return false; } - // catalina-ha.jar will be in both tc Server 6.0 and Apache Tomcat 6.0. - // We need - // to further distinguish.... - final String tcServerVersionFile = getTypeProperty("SpringSource tc Server 6.0", "VERSION_FILE"); - if (tcServerVersionFile == null) { - // tc Server plugin is not installed - return true; + + Iterator keys = PluginData.getGlobalProperties().keySet().iterator(); + String extend_server = null; + while (keys.hasNext()) { + String key = (String) keys.next(); + if (key.toUpperCase().endsWith(".EXTENDS")) { + String val = (String) PluginData.getGlobalProperties().get(key); + Pattern p = Pattern.compile(val); + Matcher m = p.matcher(getTypeInfo().getName()); + boolean find = m.find(); + getLog().debug("[isInstallTypeVersion] " + key + "=" + val + " (" + getTypeInfo().getName() + ") m.find()=" + find); + if (find) { + extend_server = key.substring(0, key.lastIndexOf(".")); + final String tcServerVersionFile = getTypeProperty(extend_server, "VERSION_FILE"); + if (tcServerVersionFile != null) { + File file = new File(catalinaHome, tcServerVersionFile); + if (file.exists()) { + getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is a '" + extend_server + "'"); + return false; + } else { + getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is not a '" + extend_server + "'"); + } + } + } + } } - File file = new File(catalinaHome, tcServerVersionFile); - if (file.exists()) { - return false; - } return true; } |
|
From: <tr...@hy...> - 2010-03-18 16:32:05
|
Author: trader Date: 2010-03-18 09:31:56 -0700 (Thu, 18 Mar 2010) New Revision: 14395 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14395 Modified: branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java Log: Reverted 14390, it went into the wrong branch Modified: branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java =================================================================== --- branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-18 07:54:15 UTC (rev 14394) +++ branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-18 16:31:56 UTC (rev 14395) @@ -23,17 +23,17 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.hyperic.hq.product.PluginException; +import org.hyperic.hq.product.ProductPlugin; import org.hyperic.hq.product.ServerResource; import org.hyperic.hq.product.Win32ControlPlugin; import org.hyperic.hq.product.jmx.MxServerDetector; import org.hyperic.hq.product.jmx.MxUtil; import org.hyperic.hq.product.jmx.MxServerDetector.MxProcess; -import org.hyperic.hq.product.pluginxml.PluginData; +import org.hyperic.util.config.ConfigOption; import org.hyperic.util.config.ConfigResponse; +import org.hyperic.util.config.ConfigSchema; import org.hyperic.sigar.win32.RegistryKey; import org.hyperic.sigar.win32.Win32Exception; @@ -168,32 +168,18 @@ if (!correctVersion) { return false; } - - Iterator keys = PluginData.getGlobalProperties().keySet().iterator(); - String extend_server = null; - while (keys.hasNext()) { - String key = (String) keys.next(); - if (key.toUpperCase().endsWith(".EXTENDS")) { - String val = (String) PluginData.getGlobalProperties().get(key); - Pattern p = Pattern.compile(val); - Matcher m = p.matcher(getTypeInfo().getName()); - boolean find = m.find(); - getLog().debug("[isInstallTypeVersion] " + key + "=" + val + " (" + getTypeInfo().getName() + ") m.find()=" + find); - if (find) { - extend_server = key.substring(0, key.lastIndexOf(".")); - final String tcServerVersionFile = getTypeProperty(extend_server, "VERSION_FILE"); - if (tcServerVersionFile != null) { - File file = new File(catalinaHome, tcServerVersionFile); - if (file.exists()) { - getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is a '" + extend_server + "'"); - return false; - } else { - getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is not a '" + extend_server + "'"); - } - } - } - } + // catalina-ha.jar will be in both tc Server 6.0 and Apache Tomcat 6.0. + // We need + // to further distinguish.... + final String tcServerVersionFile = getTypeProperty("SpringSource tc Server 6.0", "VERSION_FILE"); + if (tcServerVersionFile == null) { + // tc Server plugin is not installed + return true; } + File file = new File(catalinaHome, tcServerVersionFile); + if (file.exists()) { + return false; + } return true; } |
|
From: <bo...@hy...> - 2010-03-18 07:54:24
|
Author: bob Date: 2010-03-18 00:54:15 -0700 (Thu, 18 Mar 2010) New Revision: 14394 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14394 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1381 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-17 23:07:21 UTC (rev 14393) +++ trunk/etc/version.properties 2010-03-18 07:54:15 UTC (rev 14394) @@ -1,3 +1,3 @@ -#Wed Mar 17 00:17:32 PDT 2010 +#Thu Mar 18 00:18:59 PDT 2010 version=4.3.0 -build=1380 +build=1381 |
|
From: <dcr...@hy...> - 2010-03-17 23:07:28
|
Author: dcrutchf Date: 2010-03-17 16:07:21 -0700 (Wed, 17 Mar 2010) New Revision: 14393 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14393 Modified: trunk/src/org/hyperic/hq/hqu/rendit/i18n/BundleMapFacade.groovy Log: Added a method for parameterized i18n strings Modified: trunk/src/org/hyperic/hq/hqu/rendit/i18n/BundleMapFacade.groovy =================================================================== --- trunk/src/org/hyperic/hq/hqu/rendit/i18n/BundleMapFacade.groovy 2010-03-17 19:46:48 UTC (rev 14392) +++ trunk/src/org/hyperic/hq/hqu/rendit/i18n/BundleMapFacade.groovy 2010-03-17 23:07:21 UTC (rev 14393) @@ -1,5 +1,7 @@ package org.hyperic.hq.hqu.rendit.i18n +import java.text.MessageFormat; + /** * This class wraps a resource bundle and implements methods which make it * usable with the subscript operator (getAt) and also as object @@ -7,14 +9,18 @@ */ class BundleMapFacade { private ResourceBundle bundle - + private MessageFormat formatter + BundleMapFacade(bundle) { this.bundle = bundle + this.formatter = new MessageFormat(""); + + this.formatter.setLocale(bundle.locale); } def getAt(String o) { try { - return bundle.getString(o) + return this.bundle.getString(o) } catch(MissingResourceException e) { return "MISSING i18n KEY: ${o.toString()}" } @@ -23,4 +29,14 @@ def getProperty(String propName) { getAt(propName) } -} + + def getFormattedMessage(String key, Object... arguments) { + try { + this.formatter.applyPattern(this.bundle.getString(key)); + + return this.formatter.format(arguments); + } catch(MissingResourceException e) { + return "MISSING i18n KEY: ${o.toString()}" + } + } +} \ No newline at end of file |
|
From: <bo...@hy...> - 2010-03-17 19:46:56
|
Author: bob Date: 2010-03-17 12:46:48 -0700 (Wed, 17 Mar 2010) New Revision: 14392 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14392 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties Log: Release 4.2.0.6 build #1282 Modified: branches/HQ_4_2_0_PATCH/etc/version.properties =================================================================== --- branches/HQ_4_2_0_PATCH/etc/version.properties 2010-03-17 18:36:30 UTC (rev 14391) +++ branches/HQ_4_2_0_PATCH/etc/version.properties 2010-03-17 19:46:48 UTC (rev 14392) @@ -1,3 +1,3 @@ -#Thu Feb 11 12:51:23 PST 2010 +#Wed Mar 17 12:05:19 PDT 2010 version=4.2.0.6 -build=1281 +build=1282 |
|
From: <gla...@hy...> - 2010-03-17 18:36:38
|
Author: glaullon Date: 2010-03-17 11:36:30 -0700 (Wed, 17 Mar 2010) New Revision: 14391 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14391 Modified: trunk/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java Log: Tomcat / TC Server Modified: trunk/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java =================================================================== --- trunk/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-17 18:30:15 UTC (rev 14390) +++ trunk/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-17 18:36:30 UTC (rev 14391) @@ -23,6 +23,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.hyperic.hq.product.PluginException; import org.hyperic.hq.product.ProductPlugin; @@ -31,6 +34,7 @@ import org.hyperic.hq.product.jmx.MxServerDetector; import org.hyperic.hq.product.jmx.MxUtil; import org.hyperic.hq.product.jmx.MxServerDetector.MxProcess; +import org.hyperic.hq.product.pluginxml.PluginData; import org.hyperic.util.config.ConfigOption; import org.hyperic.util.config.ConfigResponse; import org.hyperic.util.config.ConfigSchema; @@ -168,18 +172,32 @@ if (!correctVersion) { return false; } - // catalina-ha.jar will be in both tc Server 6.0 and Apache Tomcat 6.0. - // We need - // to further distinguish.... - final String tcServerVersionFile = getTypeProperty("SpringSource tc Server 6.0", "VERSION_FILE"); - if (tcServerVersionFile == null) { - // tc Server plugin is not installed - return true; + + Iterator keys = PluginData.getGlobalProperties().keySet().iterator(); + String extend_server = null; + while (keys.hasNext()) { + String key = (String) keys.next(); + if (key.toUpperCase().endsWith(".EXTENDS")) { + String val = (String) PluginData.getGlobalProperties().get(key); + Pattern p = Pattern.compile(val); + Matcher m = p.matcher(getTypeInfo().getName()); + boolean find = m.find(); + getLog().debug("[isInstallTypeVersion] " + key + "=" + val + " (" + getTypeInfo().getName() + ") m.find()=" + find); + if (find) { + extend_server = key.substring(0, key.lastIndexOf(".")); + final String tcServerVersionFile = getTypeProperty(extend_server, "VERSION_FILE"); + if (tcServerVersionFile != null) { + File file = new File(catalinaHome, tcServerVersionFile); + if (file.exists()) { + getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is a '" + extend_server + "'"); + return false; + } else { + getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is not a '" + extend_server + "'"); + } + } + } + } } - File file = new File(catalinaHome, tcServerVersionFile); - if (file.exists()) { - return false; - } return true; } |
|
From: <gla...@hy...> - 2010-03-17 18:30:27
|
Author: glaullon Date: 2010-03-17 11:30:15 -0700 (Wed, 17 Mar 2010) New Revision: 14390 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14390 Modified: branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java Log: Tomcat / TC Server Modified: branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java =================================================================== --- branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-17 16:30:34 UTC (rev 14389) +++ branches/HQ_4_2/plugins/tomcat/src/org/hyperic/hq/plugin/tomcat/TomcatServerDetector.java 2010-03-17 18:30:15 UTC (rev 14390) @@ -23,17 +23,17 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.hyperic.hq.product.PluginException; -import org.hyperic.hq.product.ProductPlugin; import org.hyperic.hq.product.ServerResource; import org.hyperic.hq.product.Win32ControlPlugin; import org.hyperic.hq.product.jmx.MxServerDetector; import org.hyperic.hq.product.jmx.MxUtil; import org.hyperic.hq.product.jmx.MxServerDetector.MxProcess; -import org.hyperic.util.config.ConfigOption; +import org.hyperic.hq.product.pluginxml.PluginData; import org.hyperic.util.config.ConfigResponse; -import org.hyperic.util.config.ConfigSchema; import org.hyperic.sigar.win32.RegistryKey; import org.hyperic.sigar.win32.Win32Exception; @@ -168,18 +168,32 @@ if (!correctVersion) { return false; } - // catalina-ha.jar will be in both tc Server 6.0 and Apache Tomcat 6.0. - // We need - // to further distinguish.... - final String tcServerVersionFile = getTypeProperty("SpringSource tc Server 6.0", "VERSION_FILE"); - if (tcServerVersionFile == null) { - // tc Server plugin is not installed - return true; + + Iterator keys = PluginData.getGlobalProperties().keySet().iterator(); + String extend_server = null; + while (keys.hasNext()) { + String key = (String) keys.next(); + if (key.toUpperCase().endsWith(".EXTENDS")) { + String val = (String) PluginData.getGlobalProperties().get(key); + Pattern p = Pattern.compile(val); + Matcher m = p.matcher(getTypeInfo().getName()); + boolean find = m.find(); + getLog().debug("[isInstallTypeVersion] " + key + "=" + val + " (" + getTypeInfo().getName() + ") m.find()=" + find); + if (find) { + extend_server = key.substring(0, key.lastIndexOf(".")); + final String tcServerVersionFile = getTypeProperty(extend_server, "VERSION_FILE"); + if (tcServerVersionFile != null) { + File file = new File(catalinaHome, tcServerVersionFile); + if (file.exists()) { + getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is a '" + extend_server + "'"); + return false; + } else { + getLog().debug("[isInstallTypeVersion] '" + getTypeInfo().getName() + " [" + process.getInstallPath() + "]' is not a '" + extend_server + "'"); + } + } + } + } } - File file = new File(catalinaHome, tcServerVersionFile); - if (file.exists()) { - return false; - } return true; } |
|
From: <rm...@hy...> - 2010-03-17 16:30:43
|
Author: rmorgan Date: 2010-03-17 09:30:34 -0700 (Wed, 17 Mar 2010) New Revision: 14389 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14389 Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java Log: [HHQ-3265] Remove the service from the ServiceType.services() collection on delete. This fixes "deleted object would be re-saved by cascade" errors during plugin deployment when a service type has been removed. [merge from trunk] Modified: branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java =================================================================== --- branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java 2010-03-17 16:28:12 UTC (rev 14388) +++ branches/HQ_4_2_0_PATCH/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java 2010-03-17 16:30:34 UTC (rev 14389) @@ -1493,11 +1493,11 @@ resGroupMan.removeGroupsCompatibleWith(proto); // Remove all services - for (Iterator svcIt = serviceType.getServices().iterator(); - svcIt.hasNext(); ) { - Service svcLocal = (Service) svcIt.next(); - removeService(overlord, svcLocal); - } + Service[] services = (Service[]) + serviceType.getServices().toArray(new Service[serviceType.getServices().size()]); + for (int i = 0; i < services.length; i++) { + removeService(overlord, services[i]); + } } catch (PermissionException e) { assert false : "Overlord should not run into PermissionException"; @@ -1526,6 +1526,9 @@ server.getServices().remove(service); } + // Remove from ServiceType collection + service.getServiceType().getServices().remove(service); + final ConfigResponseDB config = service.getConfigResponse(); // remove from appdef |
|
From: <rm...@hy...> - 2010-03-17 16:28:23
|
Author: rmorgan Date: 2010-03-17 09:28:12 -0700 (Wed, 17 Mar 2010) New Revision: 14388 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14388 Modified: trunk/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java Log: [HHQ-3265] Remove the service from the ServiceType.services() collection on delete. This fixes "deleted object would be re-saved by cascade" errors during plugin deployment when a service type has been removed. Modified: trunk/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java 2010-03-17 07:54:44 UTC (rev 14387) +++ trunk/src/org/hyperic/hq/appdef/server/session/ServiceManagerEJBImpl.java 2010-03-17 16:28:12 UTC (rev 14388) @@ -1493,11 +1493,11 @@ resGroupMan.removeGroupsCompatibleWith(proto); // Remove all services - for (Iterator svcIt = serviceType.getServices().iterator(); - svcIt.hasNext(); ) { - Service svcLocal = (Service) svcIt.next(); - removeService(overlord, svcLocal); - } + Service[] services = (Service[]) + serviceType.getServices().toArray(new Service[serviceType.getServices().size()]); + for (int i = 0; i < services.length; i++) { + removeService(overlord, services[i]); + } } catch (PermissionException e) { assert false : "Overlord should not run into PermissionException"; @@ -1526,6 +1526,9 @@ server.getServices().remove(service); } + // Remove from ServiceType collection + service.getServiceType().getServices().remove(service); + final ConfigResponseDB config = service.getConfigResponse(); // remove from appdef |
|
From: <bo...@hy...> - 2010-03-17 07:54:53
|
Author: bob Date: 2010-03-17 00:54:44 -0700 (Wed, 17 Mar 2010) New Revision: 14387 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14387 Modified: trunk/etc/version.properties Log: Release 4.3.0 build #1380 Modified: trunk/etc/version.properties =================================================================== --- trunk/etc/version.properties 2010-03-16 17:11:17 UTC (rev 14386) +++ trunk/etc/version.properties 2010-03-17 07:54:44 UTC (rev 14387) @@ -1,3 +1,3 @@ -#Tue Mar 16 00:17:03 PDT 2010 +#Wed Mar 17 00:17:32 PDT 2010 version=4.3.0 -build=1379 +build=1380 |
|
From: <sc...@hy...> - 2010-03-16 17:11:33
|
Author: scottmf Date: 2010-03-16 10:11:17 -0700 (Tue, 16 Mar 2010) New Revision: 14386 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14386 Modified: trunk/etc/ehcache.xml Log: [HHQ-3798] remove Measurement.findAvailMeasurements cache. Modified: trunk/etc/ehcache.xml =================================================================== --- trunk/etc/ehcache.xml 2010-03-16 17:10:13 UTC (rev 14385) +++ trunk/etc/ehcache.xml 2010-03-16 17:11:17 UTC (rev 14386) @@ -137,12 +137,6 @@ timeToIdleSeconds="0" timeToLiveSeconds="0" memoryStoreEvictionPolicy="LRU"/> - <cache name="Measurement.findAvailMeasurements" - maxElementsInMemory="1000" - eternal="true" - timeToIdleSeconds="0" - timeToLiveSeconds="0" - memoryStoreEvictionPolicy="LRU"/> <cache name="Measurement.findAvailMeasurementsForGroup" maxElementsInMemory="500" eternal="true" |
14 messages has been excluded from this view by a project administrator.
