rhq-commits January 2013

rhq-commits@lists.fedorahosted.org

12 participants
269 discussions

[rhq] Branch 'release/jon3.1.x' - modules/enterprise
by Jay Shaughnessy 28 Jan '13

28 Jan '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 51 ++++++---- 1 file changed, 33 insertions(+), 18 deletions(-) New commits: commit 7f22ad308f34e1d57763099a4716dc29a3de5f58 Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb> Date: Mon Jan 28 16:42:35 2013 -0500 Fix cherry-pick merge issue diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java index 91c61af..1c6fd66 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java @@ -30,7 +30,6 @@ import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeResponse; import org.rhq.core.clientapi.server.discovery.DiscoveryServerService; import org.rhq.core.clientapi.server.discovery.InvalidInventoryReportException; import org.rhq.core.clientapi.server.discovery.InventoryReport; -import org.rhq.core.clientapi.server.discovery.StaleTypeException; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.discovery.AvailabilityReport; @@ -52,6 +51,7 @@ import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.enterprise.server.util.concurrent.AvailabilityReportSerializer; +import org.rhq.enterprise.server.util.concurrent.InventoryReportSerializer; /** * This is the service that receives inventory data from agents. As agents discover resources, they report back to the @@ -66,22 +66,34 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { * @see DiscoveryServerService#mergeInventoryReport(InventoryReport) */ @Override - public ResourceSyncInfo mergeInventoryReport(InventoryReport report) throws InvalidInventoryReportException, - StaleTypeException { + public ResourceSyncInfo mergeInventoryReport(InventoryReport report) throws InvalidInventoryReportException { InventoryReportSerializer.getSingleton().lock(report.getAgent().getName()); try { - syncInfo = discoveryBoss.mergeInventoryReport(report); - } catch (InvalidInventoryReportException e) { - Agent agent = report.getAgent(); - if (log.isDebugEnabled()) { - log.error("Received invalid inventory report from agent [" + agent + "]", e); - } else { - /* - * this is expected when the platform is uninventoried, because the agent often has in-flight reports - * going to the server at the time the platform's agent is being deleted from the database - */ - log.error("Received invalid inventory report from agent [" + agent + "]: " + e.getMessage()); + long start = System.currentTimeMillis(); + DiscoveryBossLocal discoveryBoss = LookupUtil.getDiscoveryBoss(); + ResourceSyncInfo syncInfo; + + try { + syncInfo = discoveryBoss.mergeInventoryReport(report); + + } catch (InvalidInventoryReportException e) { + Agent agent = report.getAgent(); + if (log.isDebugEnabled()) { + log.error("Received invalid inventory report from agent [" + agent + "]", e); + } else { + /* + * this is expected when the platform is uninventoried, because the agent often has in-flight reports + * going to the server at the time the platform's agent is being deleted from the database + */ + log.error("Received invalid inventory report from agent [" + agent + "]: " + e.getMessage()); + } + throw e; + + } catch (RuntimeException e) { + log.error("Fatal error occurred during merging of inventory report from agent [" + report.getAgent() + + "].", e); + throw e; } long elapsed = (System.currentTimeMillis() - start); @@ -94,6 +106,7 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { } return syncInfo; + } finally { InventoryReportSerializer.getSingleton().unlock(report.getAgent().getName()); } @@ -113,10 +126,12 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { long elapsed = (System.currentTimeMillis() - start); if (elapsed > 20000L) { - log.warn("Performance: processed " + reportToString + " - needFull=[" + !ok + "] in (" + elapsed + ")ms"); + log.warn("Performance: processed " + reportToString + " - needFull=[" + !ok + "] in (" + elapsed + + ")ms"); } else { if (log.isDebugEnabled()) { - log.debug("Performance: processed " + reportToString + " - needFull=[" + !ok + "] in (" + elapsed + ")ms"); + log.debug("Performance: processed " + reportToString + " - needFull=[" + !ok + "] in (" + elapsed + + ")ms"); } } @@ -227,8 +242,8 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { } private static boolean isVisibleInInventory(Resource resource) { - return resource.getInventoryStatus() != InventoryStatus.DELETED && - resource.getInventoryStatus() != InventoryStatus.UNINVENTORIED; + return resource.getInventoryStatus() != InventoryStatus.DELETED + && resource.getInventoryStatus() != InventoryStatus.UNINVENTORIED; } @Override

1 0

[rhq] Branch 'feature/cassandra-backend' - 2 commits - modules/common modules/core
by John Sanda 28 Jan '13

28 Jan '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/deploy.xml | 6 -- modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java | 2 modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java | 22 ++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) New commits: commit e4a4d66dd6c8de11cd29b0bd4072fae2984a26f0 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jan 28 16:38:05 2013 -0500 clean up bundle recipe so it no longer creates incorrect directories In the post-install target the recipe was creating some data and log directories, and due to some prior changes those directories wound up with the wrong paths. The paths are correct in cassandra.yaml though. That part of the bundle recipe has been altgother removed though as cassandra will create the directories. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/deploy.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/deploy.xml index 2beacae..d6f3d98 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/deploy.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/deploy.xml @@ -180,16 +180,12 @@ <target name="pre-install"> <mkdir dir="${cluster.dir}"/> + </target> <target name="post-install"> <property name="bin.dir" value="${rhq.deploy.dir}/bin"/> - <mkdir dir="${rhq.deploy.dir}/${data.dir}"/> - <mkdir dir="${rhq.deploy.dir}/${commitlog.dir}"/> - <mkdir dir="${rhq.deploy.dir}/${saved.caches.dir}"/> - <mkdir dir="${rhq.deploy.dir}/${log.dir}"/> - <chmod file="${bin.dir}/cassandra" perm="+x"/> <chmod file="${bin.dir}/cqlsh" perm="+x"/> <chmod file="${bin.dir}/cassandra-cli" perm="+x"/> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java b/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java index 3146209..a25377a 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java @@ -76,7 +76,7 @@ public class CCMTestNGListener implements IInvokedMethodListener { private void deployCluster(DeployCluster annotation) throws CassandraException { String clusterDir = System.getProperty("rhq.cassandra.cluster.dir"); - if (clusterDir == null) { + if (clusterDir == null || clusterDir.isEmpty()) { File basedir = new File("target"); clusterDir = new File(basedir, "cassandra").getAbsolutePath(); } commit 8bf73b1d323b60dbc56198119488f049eb02cde2 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jan 28 16:36:54 2013 -0500 add tear down logic to clean up db diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java index 2709158..439324b 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java @@ -29,6 +29,7 @@ import java.util.List; import javax.persistence.EntityManager; +import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -87,9 +88,30 @@ public class JPADriftChangeSetTest extends DriftDataAccessTest { }); } + @AfterMethod(alwaysRun = true, groups = {"JPADriftChangeSet", "drift.ejb"}) + public void tearDown() { + if (!inContainer()) { + return; + } + + executeInTransaction(false, new TransactionCallback() { + @Override + public void execute() throws Exception { + purgeDB(); + } + }); + } + private void purgeDB() { EntityManager em = getEntityManager(); + em.createQuery("delete from JPADrift ").executeUpdate(); + em.createQuery("delete from JPADriftChangeSet").executeUpdate(); + em.createQuery("delete from JPADriftSet").executeUpdate(); + em.createQuery("delete from JPADriftFile").executeUpdate(); + em.createQuery("delete from DriftDefinition").executeUpdate(); + em.createQuery("delete from DriftDefinitionTemplate").executeUpdate(); + List<Availability> avails = (List<Availability>) em.createQuery("SELECT a FROM Availability a").getResultList(); for (Availability a : avails) { em.remove(a);

1 0

[rhq] Branch 'mtho11/d3-charts2' - 2 commits - modules/enterprise
by mike thompson 28 Jan '13

28 Jan '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 26 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 13 +++-- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 2 modules/enterprise/gui/coregui/src/main/webapp/css/tipsy.css | 17 ++++++ 4 files changed, 41 insertions(+), 17 deletions(-) New commits: commit 7196376d0cc701f5104630958f1b56164d72ca91 Author: Mike Thompson <mithomps(a)redhat.com> Date: Mon Jan 28 13:05:48 2013 -0800 Charting - Fix graphs in dialog boxes so that they dont pop up behind the dialog box. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java index bb96335..f3bdbc9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java @@ -570,7 +570,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD if (d.down) { hoverString = - '<div style="text-align:left;z-index:401000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span>' + timeFormatter(date) + '</div>' + + '<div style="text-align:left;z-index:990000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span>' + timeFormatter(date) + '</div>' + '<div style="text-align: left;"><span style="width:50px;font-weight: bold;color:#d3d3d6"";">' + chartContext.dateLabel + ': </span>' + dateFormatter(date) + '</div>' + '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></hr>' + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverStartLabel+": "+ timeFormatter(availStartDate)+ '</span></div>' + @@ -581,7 +581,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD } else if (d.y == undefined) { hoverString = - '<div style="text-align:left;z-index:401000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span>' + timeFormatter(date) + '</div>' + + '<div style="text-align:left;z-index:990000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span>' + timeFormatter(date) + '</div>' + '<div style="text-align: left;"><span style="width:50px;font-weight: bold;color:#d3d3d6"";">' + chartContext.dateLabel + ': </span>' + dateFormatter(date) + '</div>' + '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></hr>' + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverStartLabel+": "+ timeFormatter(unknownStartDate)+ '</span></div>' + @@ -593,7 +593,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD } else { hoverString = - '<div style="text-align:left;z-index:401000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span><span style="width:50px;">' + timeFormatter(date) + '</span></div>' + + '<div style="text-align:left;z-index:990000;"><span style="width:50px;font-weight: bold;color:#d3d3d6";">' + chartContext.timeLabel + ': </span><span style="width:50px;">' + timeFormatter(date) + '</span></div>' + '<div style="text-align: left;"><span style="width:50px;font-weight: bold;color:#d3d3d6"";">' + chartContext.dateLabel + ': </span><span style="width:50px;">' + dateFormatter(date) + '</span></div>' + '<div style="text-align: left;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverBarLabel+": "+ barDuration + '</span></div>' + '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></hr>' + @@ -616,6 +616,10 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD var d = this.__data__; //console.log("y: " + d.y); return formatHovers(chartContext, d); + }, + show: function (e, el) + { + el.css({ 'z-index':'990000'}) } }); } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index 0834018..6b8325f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -14,7 +14,7 @@  <inherits name='ca.nanometrics.gflot.GFlot'/> - + <set-property name="gflot.load.jquery" value="EXTERNAL" />  <set-property name="gwt.logging.enabled" value="TRUE"/> diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/tipsy.css b/modules/enterprise/gui/coregui/src/main/webapp/css/tipsy.css index 8a7734b..f1f734f 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/css/tipsy.css +++ b/modules/enterprise/gui/coregui/src/main/webapp/css/tipsy.css @@ -2,7 +2,7 @@ font-size: 10px; position: absolute; padding: 5px; - z-index: 400000; + z-index: 990000; } .tipsy-inner { @@ -11,6 +11,7 @@ max-width: 200px; padding: 5px 8px 4px 8px; text-align: center; + z-index: 990000; } /* Rounded corners */ @@ -18,6 +19,7 @@ border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; + z-index: 990000; } /* Uncomment for shadow */ @@ -29,23 +31,28 @@ height: 0; line-height: 0; border: 5px dashed #000; + z-index: 990000; } /* Rules to colour arrows */ .tipsy-arrow-n { border-bottom-color: #000; + z-index: 990000; } .tipsy-arrow-s { border-top-color: #000; + z-index: 990000; } .tipsy-arrow-e { border-left-color: #000; + z-index: 990000; } .tipsy-arrow-w { border-right-color: #000; + z-index: 990000; } .tipsy-n .tipsy-arrow { @@ -56,6 +63,7 @@ border-top: none; border-left-color: transparent; border-right-color: transparent; + z-index: 990000; } .tipsy-nw .tipsy-arrow { @@ -65,6 +73,7 @@ border-top: none; border-left-color: transparent; border-right-color: transparent; + z-index: 990000; } .tipsy-ne .tipsy-arrow { @@ -74,6 +83,7 @@ border-top: none; border-left-color: transparent; border-right-color: transparent; + z-index: 990000; } .tipsy-s .tipsy-arrow { @@ -84,6 +94,7 @@ border-bottom: none; border-left-color: transparent; border-right-color: transparent; + z-index: 990000; } .tipsy-sw .tipsy-arrow { @@ -93,6 +104,7 @@ border-bottom: none; border-left-color: transparent; border-right-color: transparent; + z-index: 990000; } .tipsy-se .tipsy-arrow { @@ -102,6 +114,7 @@ border-bottom: none; border-left-color: transparent; border-right-color: transparent; + z-index: 990000; } .tipsy-e .tipsy-arrow { @@ -112,6 +125,7 @@ border-right: none; border-top-color: transparent; border-bottom-color: transparent; + z-index: 990000; } .tipsy-w .tipsy-arrow { @@ -122,4 +136,5 @@ border-left: none; border-top-color: transparent; border-bottom-color: transparent; + z-index: 990000; } commit e0b704ad886a875bbd4fcc263ea026b26e9a9e22 Author: Mike Thompson <mithomps(a)redhat.com> Date: Fri Jan 25 10:09:19 2013 -0800 Charting -Add duration to hover for unknown intervals. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java index e296eed..e8c2523 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java @@ -255,7 +255,6 @@ public class MetricGraphData implements JsonMetricProducer { calculateOOB(); calculateUnknownIntervals(); - dumpUnknownIntervals(); for (MeasurementDataNumericHighLowComposite measurement : metricData) { sb.append("{ x:" + measurement.getTimestamp() + ","); @@ -264,8 +263,9 @@ public class MetricGraphData implements JsonMetricProducer { // loop through the avail down intervals for (Availability availability : availabilityDownList) { // we know we are in an interval - Log.debug(" *** Avail: " + availability); - //if (barDateTime.after(datePair.startDateTime) && barDateTime.before(datePair.getEndDateTime())) { + //Log.debug("Availability: " + availability); + //Log.debug("Measurement: " + measurement); + // @todo: when resource is down measurement is null NPE if (measurement.getTimestamp() >= availability.getStartTime() && measurement.getTimestamp() <= availability.getEndTime()) { sb.append(" availStart:" + availability.getStartTime() + ", "); @@ -312,6 +312,10 @@ public class MetricGraphData implements JsonMetricProducer { && measurement.getTimestamp() <= datePair.getEndDateTime().getTime()) { sb.append(" unknownStart:" + datePair.getStartDateTime().getTime() + ", "); sb.append(" unknownEnd:" + datePair.getEndDateTime().getTime() + ", "); + long unknownDuration = datePair.getEndDateTime().getTime() - datePair.getStartDateTime().getTime(); + String unknownDurationString = MeasurementConverterClient.format((double) unknownDuration, + MeasurementUnits.MILLISECONDS, true); + sb.append(" unknownDuration: \"" + unknownDurationString + "\", "); break; } } @@ -350,11 +354,7 @@ public class MetricGraphData implements JsonMetricProducer { } } - private void dumpUnknownIntervals() { - for (DatePair datePair : unknownIntervalList) { - Log.debug("Interval: " + datePair.getStartDateTime() + " - " + datePair.getEndDateTime()); - } - } + private void calculateUnknownIntervals() { @@ -366,7 +366,7 @@ public class MetricGraphData implements JsonMetricProducer { boolean notAtStart = i > 1; boolean currentBarUndefined = Double.isNaN(measurement.getValue()); boolean previousBarDefined = (notAtStart) ? !Double.isNaN(metricData.get(i - 1).getValue()) : false; - if (currentBarUndefined && previousBarDefined && notAtStart) { + if (currentBarUndefined && previousBarDefined && notAtStart && i < metricData.size()-1) { //Log.debug("Adding Down or Disabled start Point: " + i); startPoints.add(i+1); } @@ -374,15 +374,16 @@ public class MetricGraphData implements JsonMetricProducer { } // iterate over the start points to the end of the consecutive bars or end of metricData // from the starting interval points find the interval end point + if(null != startPoints){ for (Integer startPoint : startPoints) { - Log.debug("StartPoint: " + new Date(metricData.get(startPoint).getTimestamp())); - for (int j = 0; j < metricData.size() - 1; j++) { + Log.debug("StartPoint: "+ startPoint + " --> "+ new Date(metricData.get(startPoint).getTimestamp())); + for (int j = 0; j < metricData.size() - 2; j++) { boolean notAtEnd = j < metricData.size(); boolean currentBarUndefined = Double.isNaN(metricData.get(j).getValue()); boolean nextBarDefined = (notAtEnd) ? !Double.isNaN(metricData.get(j + 1).getValue()) : false; if (currentBarUndefined && nextBarDefined && notAtEnd) { Date startDate = new Date(metricData.get(startPoint).getTimestamp()); - Date endDate = new Date(metricData.get(j).getTimestamp()); + Date endDate = new Date(metricData.get(j+1).getTimestamp()); //Log.debug("\n\nStartDate: " + startDate); //Log.debug("EndDate: " + endDate); DatePair datePair = new DatePair(startDate, endDate); @@ -390,6 +391,7 @@ public class MetricGraphData implements JsonMetricProducer { } } } + } //Log.debug("intervalDatePairList.size():" + unknownIntervalList.size()); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java index 676812f..bb96335 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java @@ -81,6 +81,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD "use strict"; // privates + console.log("Chart Height: "+chartContext.height); var margin = {top: 10, right: 5, bottom: 20, left: 40}, width = 750 - margin.left - margin.right, adjustedChartHeight = chartContext.chartHeight - 40, @@ -560,6 +561,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD barDuration = d.barDuration, unknownStartDate = new Date(+d.unknownStart), unknownEndDate = new Date(+d.unknownEnd), + unknownDuration = d.unknownDuration, timeFormatter = $wnd.d3.time.format("%I:%M:%S %p"), dateFormatter = $wnd.d3.time.format("%m/%d/%y"), highValue = (d.high == undefined) ? 0 : d.high.toFixed(2), @@ -584,6 +586,7 @@ public final class MetricStackedBarGraph extends MetricGraphData implements HasD '<hr style="width:100%;text-align: center;border: #d3d3d3 solid thin;"></hr>' + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverStartLabel+": "+ timeFormatter(unknownStartDate)+ '</span></div>' + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverEndLabel+": "+ timeFormatter(unknownEndDate) + '</span></div>' + + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.hoverPeriodLabel+": "+ unknownDuration + '</span></div>' + '<div style="text-align: right;"><span style="width:100%;font-weight:bold;color:#d3d3d6"";">'+chartContext.unknownLabel+'</span></div>' + '</div>';

1 0

[rhq] Branch 'release/jon3.1.x' - modules/plugins
by mazz 28 Jan '13

28 Jan '13

modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml | 23 ++++ modules/plugins/perftest/src/main/resources/configurable-deep.xml | 49 ++++++++++ 2 files changed, 72 insertions(+) New commits: commit cd0310a3363c9fc0f2b60874f5a7d19614f58a6b Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Jan 23 16:29:38 2013 -0500 allow perftest plugin to have 6-level hierarchies diff --git a/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml index 72fae98..848f127 100644 --- a/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml @@ -363,6 +363,29 @@ </service> </server> + <server name="server-deep1" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Server Deep1"> + <service name="service-deep2" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Service Deep2"> + <metric property="metric000" defaultOn="true" displayType="summary"/> + <metric property="metric001" defaultOn="true" displayType="summary"/> + <service name="service-deep3" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Service Deep3"> + <metric property="metric000" defaultOn="true" displayType="summary"/> + <metric property="metric001" defaultOn="true" displayType="summary"/> + <service name="service-deep4" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Service Deep4"> + <metric property="metric000" defaultOn="true" displayType="summary"/> + <metric property="metric001" defaultOn="true" displayType="summary"/> + <service name="service-deep5" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Service Deep5"> + <metric property="metric000" defaultOn="true" displayType="summary"/> + <metric property="metric001" defaultOn="true" displayType="summary"/> + <service name="service-deep6" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Service Deep6"> + <metric property="metric000" defaultOn="true" displayType="summary"/> + <metric property="metric001" defaultOn="true" displayType="summary"/> + </service> + </service> + </service> + </service> + </service> + </server> + <server name="server-rogue" class="PerfTestRogueComponent" discovery="PerfTestRogueDiscoveryComponent" diff --git a/modules/plugins/perftest/src/main/resources/configurable-deep.xml b/modules/plugins/perftest/src/main/resources/configurable-deep.xml new file mode 100644 index 0000000..74b94aa --- /dev/null +++ b/modules/plugins/perftest/src/main/resources/configurable-deep.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:xmlns:jboss.org:rhq-perftest"> + +  + + <resource type="server-deep1"> + <simpleResourceGenerator property="rhq.perftest.server-deep1-count"/> + <simpleNumericMeasurementGenerator/> + </resource> + + <resource type="service-deep2"> + <simpleResourceGenerator property="rhq.perftest.service-deep2-count"/> + <simpleNumericMeasurementGenerator/> + </resource> + + <resource type="service-deep3"> + <simpleResourceGenerator property="rhq.perftest.service-deep3-count"/> + <simpleNumericMeasurementGenerator/> + </resource> + + <resource type="service-deep4"> + <simpleResourceGenerator property="rhq.perftest.service-deep4-count"/> + <simpleNumericMeasurementGenerator/> + </resource> + + <resource type="service-deep5"> + <simpleResourceGenerator property="rhq.perftest.service-deep5-count"/> + <simpleNumericMeasurementGenerator/> + </resource> + + <resource type="service-deep6"> + <simpleResourceGenerator property="rhq.perftest.service-deep6-count"/> + <simpleNumericMeasurementGenerator/> + </resource> + +</scenario>

1 0

[rhq] Branch 'release/jon3.1.x' - modules/enterprise
by Jay Shaughnessy 28 Jan '13

28 Jan '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 53 +++++----- 1 file changed, 27 insertions(+), 26 deletions(-) New commits: commit 3de9ed57ad0ca55d59c22d0d48339f48c91b139e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 15:27:35 2013 -0500 Change some test logging from info to debug CP master: ec3ef12e5300c0cecfe06fa7a693a8205e1e043c diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index 1ac1423..2a2a80f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -734,10 +734,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot // tree and chunk through it. Parents must be merged before children, so use a breadth first approach. List<Resource> resourceList = treeToBreadthFirstList(resource); - // TODO: if (log.isDebugEnabled()) { - log.info("Preparing to merge [" + resourceList.size() + "] Resources with a batch size of [" + MERGE_BATCH_SIZE - + "]"); - //} + if (log.isDebugEnabled()) { + log.debug("Preparing to merge [" + resourceList.size() + "] Resources with a batch size of [" + + MERGE_BATCH_SIZE + "]"); + } while (!resourceList.isEmpty()) { int size = resourceList.size(); @@ -750,10 +750,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot resourceBatch.clear(); } - // TODO: if (log.isDebugEnabled()) { - log.info("Resource and children merged: resource/millis=" + resource.getName() + '/' - + (System.currentTimeMillis() - start)); - //} + if (log.isDebugEnabled()) { + log.debug("Resource and children merged: resource/millis=" + resource.getName() + '/' + + (System.currentTimeMillis() - start)); + } return; } @@ -780,6 +780,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot throws InvalidInventoryReportException { long batchStart = System.currentTimeMillis(); + boolean isDebugEnabled = log.isDebugEnabled(); for (Resource resource : resourceBatch) { Resource existingResource = null; @@ -796,17 +797,17 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot persistResourceInNewTransaction(resource); } - //TODO: if (log.isDebugEnabled()) { - log.info("Single Resource merged: resource/millis=" + resource.getName() + '/' - + (System.currentTimeMillis() - start)); - //} + if (isDebugEnabled) { + log.debug("Single Resource merged: resource/millis=" + resource.getName() + '/' + + (System.currentTimeMillis() - start)); + } } - //TODO: if (log.isDebugEnabled()) { - long delta = (System.currentTimeMillis() - batchStart); - log.info("Resource Batch merged: size/average/millis=" + resourceBatch.size() + "/" + delta - / resourceBatch.size() + "/" + delta); - //} + if (isDebugEnabled) { + long delta = (System.currentTimeMillis() - batchStart); + log.debug("Resource Batch merged: size/average/millis=" + resourceBatch.size() + "/" + delta + / resourceBatch.size() + "/" + delta); + } } /** @@ -833,7 +834,9 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot */ private Resource findExistingResource(Resource resource) { - if (log.isDebugEnabled()) { + boolean isDebugEnabled = log.isDebugEnabled(); + + if (isDebugEnabled) { log.debug("getExistingResource processing for [" + resource + "]"); } @@ -843,21 +846,21 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot Subject overlord = subjectManager.getOverlord(); if (resource.getId() != 0) { - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Agent claims resource is already in inventory. Id=" + resource.getId()); } try { query.setParameter("resourceId", resource.getId()); existingResource = (Resource) query.getSingleResult(); - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Found resource already in inventory. Id=" + resource.getId()); } } catch (NoResultException e) { existingResource = null; // agent lied - agent's copy of JON server inventory must be stale. - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("However, no resource exists with the specified id. Id=" + resource.getId()); } } @@ -869,7 +872,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot // this will happen if the agent found the resource (non-zero id) but the DB didn't know about it, // or if the agent didn't know about it to begin with (id was 0). if (existingResource == null) { - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Checking if a resource exists with the specified business key. Id=" + resource.getId() + ", key=" + resource.getResourceKey()); } @@ -910,7 +913,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (null != existingResource) { // We found it - reset the id to what it should be. resource.setId(existingResource.getId()); - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Found resource already in inventory with specified business key, Id=" + resource.getId()); } @@ -924,9 +927,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot // TODO: Is there anything else we should do here to inform the agent it has an out-of-sync resource? } else { - if (log.isDebugEnabled()) { - log.debug("Resource's id was already zero, nothing to do for the merge."); - } + log.debug("Resource's id was already zero, nothing to do for the merge."); } } }

1 0

[rhq] modules/enterprise
by Jay Shaughnessy 28 Jan '13

28 Jan '13

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 53 +++++----- 1 file changed, 27 insertions(+), 26 deletions(-) New commits: commit b4dabd62afa92e52cfeeb19580d8e38000c7707b Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 15:20:16 2013 -0500 Change some test logging from info to debug diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index 67bd1fa..7a5d024 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -744,10 +744,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot // tree and chunk through it. Parents must be merged before children, so use a breadth first approach. List<Resource> resourceList = treeToBreadthFirstList(resource); - // TODO: if (log.isDebugEnabled()) { - log.info("Preparing to merge [" + resourceList.size() + "] Resources with a batch size of [" + MERGE_BATCH_SIZE - + "]"); - //} + if (log.isDebugEnabled()) { + log.debug("Preparing to merge [" + resourceList.size() + "] Resources with a batch size of [" + + MERGE_BATCH_SIZE + "]"); + } while (!resourceList.isEmpty()) { int size = resourceList.size(); @@ -760,10 +760,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot resourceBatch.clear(); } - // TODO: if (log.isDebugEnabled()) { - log.info("Resource and children merged: resource/millis=" + resource.getName() + '/' - + (System.currentTimeMillis() - start)); - //} + if (log.isDebugEnabled()) { + log.debug("Resource and children merged: resource/millis=" + resource.getName() + '/' + + (System.currentTimeMillis() - start)); + } return; } @@ -790,6 +790,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot throws InvalidInventoryReportException { long batchStart = System.currentTimeMillis(); + boolean isDebugEnabled = log.isDebugEnabled(); for (Resource resource : resourceBatch) { Resource existingResource = null; @@ -806,17 +807,17 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot persistResourceInNewTransaction(resource); } - //TODO: if (log.isDebugEnabled()) { - log.info("Single Resource merged: resource/millis=" + resource.getName() + '/' - + (System.currentTimeMillis() - start)); - //} + if (isDebugEnabled) { + log.debug("Single Resource merged: resource/millis=" + resource.getName() + '/' + + (System.currentTimeMillis() - start)); + } } - //TODO: if (log.isDebugEnabled()) { - long delta = (System.currentTimeMillis() - batchStart); - log.info("Resource Batch merged: size/average/millis=" + resourceBatch.size() + "/" + delta - / resourceBatch.size() + "/" + delta); - //} + if (isDebugEnabled) { + long delta = (System.currentTimeMillis() - batchStart); + log.debug("Resource Batch merged: size/average/millis=" + resourceBatch.size() + "/" + delta + / resourceBatch.size() + "/" + delta); + } } /** @@ -843,7 +844,9 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot */ private Resource findExistingResource(Resource resource) { - if (log.isDebugEnabled()) { + boolean isDebugEnabled = log.isDebugEnabled(); + + if (isDebugEnabled) { log.debug("getExistingResource processing for [" + resource + "]"); } @@ -853,21 +856,21 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot Subject overlord = subjectManager.getOverlord(); if (resource.getId() != 0) { - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Agent claims resource is already in inventory. Id=" + resource.getId()); } try { query.setParameter("resourceId", resource.getId()); existingResource = (Resource) query.getSingleResult(); - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Found resource already in inventory. Id=" + resource.getId()); } } catch (NoResultException e) { existingResource = null; // agent lied - agent's copy of JON server inventory must be stale. - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("However, no resource exists with the specified id. Id=" + resource.getId()); } } @@ -879,7 +882,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot // this will happen if the agent found the resource (non-zero id) but the DB didn't know about it, // or if the agent didn't know about it to begin with (id was 0). if (existingResource == null) { - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Checking if a resource exists with the specified business key. Id=" + resource.getId() + ", key=" + resource.getResourceKey()); } @@ -920,7 +923,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (null != existingResource) { // We found it - reset the id to what it should be. resource.setId(existingResource.getId()); - if (log.isDebugEnabled()) { + if (isDebugEnabled) { log.debug("Found resource already in inventory with specified business key, Id=" + resource.getId()); } @@ -934,9 +937,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot // TODO: Is there anything else we should do here to inform the agent it has an out-of-sync resource? } else { - if (log.isDebugEnabled()) { - log.debug("Resource's id was already zero, nothing to do for the merge."); - } + log.debug("Resource's id was already zero, nothing to do for the merge."); } } }

1 0

[rhq] Branch 'release/jon3.1.x' - 10 commits - modules/core modules/enterprise modules/plugins
by Jay Shaughnessy 28 Jan '13

28 Jan '13

modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java | 112 ++ modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/DiscoveryServerService.java | 3 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java | 233 ++++ modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java | 4 modules/core/client-api/src/test/resources/metadata-manager-test-2.xml | 3 modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 6 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java | 48 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java | 42 modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java | 37 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 7 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java | 10 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java | 6 modules/enterprise/agent/src/main/resources/agent-configuration.xml | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 490 ++++++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 30 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/concurrent/InventoryReportSerializer.java | 101 ++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java | 9 modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 1 20 files changed, 964 insertions(+), 223 deletions(-) New commits: commit 40caae29a4dadc018a96ae4cbf687ff3f8b594b1 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 15:00:29 2013 -0500 don't do this - will NPE when nothign is disabled and we will rebuild this collection here anyway CP master: 085acde34623280a7720ee866f0efd4fc005d435 diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java index 01f8297..c091125 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java @@ -177,7 +177,6 @@ public class PluginMetadataManager { for (ResourceType oldType : oldParser.getAllTypes()) { this.typesByCategory.get(oldType.getCategory()).remove(oldType); this.types.remove(oldType); - this.disabledResourceTypes.remove(oldType); } } } commit 811fbb8970b3013fc0e6555c0db908f9112ff13a Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:59:58 2013 -0500 provide an agent configuration setting to disable resource types on the agent CP master: 13cb988bb4835289393c8e3f736918651d6e2bae diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java index 5ed8a38..01f8297 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java @@ -22,6 +22,7 @@ */ package org.rhq.core.clientapi.agent.metadata; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; @@ -73,6 +74,11 @@ public class PluginMetadataManager { private Map<String, PluginDescriptor> descriptorsByPlugin = new HashMap<String, PluginDescriptor>(); + private List<String> disabledResourceTypesAsStrings = null; + private Map<ResourceType, String> disabledResourceTypes = null; + private String disabledDiscoveryComponentClassName = null; + private String disabledResourceComponentClassName = null; + public PluginMetadataManager() { } @@ -138,11 +144,17 @@ public class PluginMetadataManager { } public String getDiscoveryClass(ResourceType resourceType) { + if (isDisabledResourceType(resourceType)) { + return this.disabledDiscoveryComponentClassName; + } PluginMetadataParser parser = this.parsersByPlugin.get(resourceType.getPlugin()); return (parser != null) ? parser.getDiscoveryComponentClass(resourceType) : null; } public String getComponentClass(ResourceType resourceType) { + if (isDisabledResourceType(resourceType)) { + return this.disabledResourceComponentClassName; + } PluginMetadataParser parser = this.parsersByPlugin.get(resourceType.getPlugin()); return (parser != null) ? parser.getComponentClass(resourceType) : null; } @@ -165,6 +177,7 @@ public class PluginMetadataManager { for (ResourceType oldType : oldParser.getAllTypes()) { this.typesByCategory.get(oldType.getCategory()).remove(oldType); this.types.remove(oldType); + this.disabledResourceTypes.remove(oldType); } } } @@ -182,7 +195,11 @@ public class PluginMetadataManager { } } - return parser.getRootResourceTypes(); + findDisabledResourceTypesInAllPlugins(); + + Set<ResourceType> rootTypes = parser.getRootResourceTypes(); + return rootTypes; + } catch (InvalidPluginDescriptorException e) { // TODO Should we throw back or log partial failures or store them against the definitions? log.error("Error transforming plugin descriptor [" + pluginDescriptor.getName() + "].", e); @@ -191,19 +208,6 @@ public class PluginMetadataManager { return null; } - // TODO Is this really appropriate? It's inconvenient to look up including the parent but - // that is currently the accurate limiter... need to consider type keys - // Otherwise we could use the business key which is the "plugin" name and the type name. - public ResourceType getType(String typeName, ResourceCategory category) { - for (ResourceType type : getTypesForCategory(category)) { - if (type.getName().equals(typeName)) { - return type; - } - } - - return null; - } - /** * Returns the Resource type with the specified name and plugin, or null if no such Resource type exists. * @@ -360,4 +364,85 @@ public class PluginMetadataManager { } return false; } + + /** + * This will define resource types that will be disabled - and by that it means + * the discovery and resource components will not do anything (it is assumed + * the classnames for the component classes will not do anything). + * + * Owners of this metadata manager need to set this during initialization prior to + * loading any plugins. + * + * @param disabledTypesAsStrings list of types, in the form "pluginName>parentType>childType" + * @param disabledDiscoveryComponentClassName the name of the discovery component class of all disable types + * @param disabledResourceComponentClassName the name of the resource component class of all disable types + */ + public void setDisabledResourceTypes(List<String> disabledTypesAsStrings, + String disabledDiscoveryComponentClassName, String disabledResourceComponentClassName) { + + if (disabledTypesAsStrings != null && !disabledTypesAsStrings.isEmpty()) { + this.disabledDiscoveryComponentClassName = disabledDiscoveryComponentClassName; + this.disabledResourceComponentClassName = disabledResourceComponentClassName; + this.disabledResourceTypesAsStrings = new ArrayList<String>(disabledTypesAsStrings); + log.info("Will disable the following resource types: " + this.disabledResourceTypesAsStrings); + } else { + this.disabledDiscoveryComponentClassName = null; + this.disabledResourceComponentClassName = null; + this.disabledResourceTypesAsStrings = null; + } + return; + } + + private boolean isDisabledResourceType(ResourceType resourceType) { + if (this.disabledResourceTypes == null) { + return false; + } + return this.disabledResourceTypes.containsKey(resourceType); + } + + // finds if type or its children are disabled and if so adds them to the map with their string representation + private void findDisabledResourceTypes(String parentHierarchy, ResourceType type, + HashMap<ResourceType, String> disabledTypes) { + // this is the current level we are at in the type hierarchy, as written in string form ("plugin>type>type...") + String typeHierarchy = parentHierarchy + '>' + type.getName(); + + // see if the given type is to be disabled - if so, add it to the map + if (this.disabledResourceTypesAsStrings.contains(typeHierarchy)) { + log.debug("Disabling resource type: " + type); + disabledTypes.put(type, typeHierarchy); + } + + // recursively call ourselves to see if any child types are to be disabled + Set<ResourceType> childTypes = type.getChildResourceTypes(); + if (childTypes != null) { + for (ResourceType childType : childTypes) { + findDisabledResourceTypes(typeHierarchy, childType, disabledTypes); + } + } + + return; + } + + private void findDisabledResourceTypesInAllPlugins() { + if (this.disabledResourceTypesAsStrings != null) { + int totalToBeDisabled = this.disabledResourceTypesAsStrings.size(); + // we have to do it all over again over all plugins because we need to support the injection extension model + // that is, <runs-inside> - new plugins coming online might have injected types in previously loaded plugins + HashMap<ResourceType, String> disabledTypes = new HashMap<ResourceType, String>(); + for (Map.Entry<String, PluginMetadataParser> entry : parsersByPlugin.entrySet()) { + PluginMetadataParser parser = entry.getValue(); + PluginDescriptor pluginDescriptor = parser.getDescriptor(); + Set<ResourceType> rootTypes = parser.getRootResourceTypes(); + String hierarchyStart = pluginDescriptor.getName(); + for (ResourceType rootType : rootTypes) { + findDisabledResourceTypes(hierarchyStart, rootType, disabledTypes); + } + if (disabledTypes.size() == totalToBeDisabled) { + break; // we found them all, no need to look at any more plugins + } + } + this.disabledResourceTypes = (!disabledTypes.isEmpty()) ? disabledTypes : null; + } + return; + } } diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java new file mode 100644 index 0000000..d95f099 --- /dev/null +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerDisabledTypesTest.java @@ -0,0 +1,233 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.clientapi.agent.metadata.test; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.util.ValidationEventCollector; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import org.rhq.core.clientapi.agent.metadata.PluginMetadataManager; +import org.rhq.core.clientapi.descriptor.DescriptorPackages; +import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; +import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.ResourceType; + +/** + * Tests disabling resource types. + * + * @author John Mazzitelli + */ +public class MetadataManagerDisabledTypesTest { + private static final String DESCRIPTOR_FILENAME_TEST1 = "metadata-manager-test-1.xml"; + private static final String DESCRIPTOR_FILENAME_TEST2 = "metadata-manager-test-2.xml"; + private static final String DESCRIPTOR_FILENAME_TEST3 = "metadata-manager-test-3.xml"; + + private PluginMetadataManager metadataManager; + private final String disabledDiscoveryClazz = "org.rhq.test.DisabledDiscoveryClazzName"; + private final String disabledComponentClazz = "org.rhq.test.DisabledResourceClazzName"; + + @BeforeClass + public void beforeClass() { + try { + this.metadataManager = new PluginMetadataManager(); + + List<String> disabledTypes = new ArrayList<String>(); + disabledTypes.add("Test1>Server A>Service B"); // from DESCRIPTOR_FILENAME_TEST1 + disabledTypes.add("Test1>Server A>Service D>Dependent Service E"); // from DESCRIPTOR_FILENAME_TEST1 + disabledTypes.add("Test2>Extension Service C"); // from DESCRIPTOR_FILENAME_TEST2 + disabledTypes.add("Test2>Extension Server B>Service D"); // from DESCRIPTOR_FILENAME_TEST2 + disabledTypes.add("Test1>Server A>Injection D To Server A"); // from DESCRIPTOR_FILENAME_TEST3 + disabledTypes.add("Test2>Extension Server B>Injection C To Server A"); // from DESCRIPTOR_FILENAME_TEST3 + this.metadataManager + .setDisabledResourceTypes(disabledTypes, disabledDiscoveryClazz, disabledComponentClazz); + + } catch (Throwable t) { + // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them + // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)! + t.printStackTrace(); + throw new RuntimeException(t); + } + } + + @Test + public void loadPluginDescriptorTest1() throws Exception { + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST1); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + + this.metadataManager.loadPlugin(pluginDescriptor); + + System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 1"); + outputTypes(); + } + + @Test(dependsOnMethods = "loadPluginDescriptorTest1") + public void loadPluginDescriptorTest2() throws Exception { + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST2); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + + this.metadataManager.loadPlugin(pluginDescriptor); + + System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 2"); + outputTypes(); + } + + @Test(dependsOnMethods = "loadPluginDescriptorTest2") + public void loadPluginDescriptorTest3() throws Exception { + PluginDescriptor pluginDescriptor; + + URL descriptorUrl = this.getClass().getClassLoader().getResource(DESCRIPTOR_FILENAME_TEST3); + System.out.println("Loading plugin descriptor at: " + descriptorUrl); + + JAXBContext jaxbContext = JAXBContext.newInstance(DescriptorPackages.PC_PLUGIN); + + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + ValidationEventCollector vec = new ValidationEventCollector(); + unmarshaller.setEventHandler(vec); + pluginDescriptor = (PluginDescriptor) unmarshaller.unmarshal(descriptorUrl.openStream()); + + this.metadataManager.loadPlugin(pluginDescriptor); + + System.out.println("\n~~~~~~~~~~~~DISABLE TYPES DESCRIPTOR TEST 3"); + outputTypes(); + + // now see that we disabled the types + + ResourceType serverA = getResourceType(new ResourceType("Server A", "Test1", ResourceCategory.SERVER, null)); + assert serverA != null; + assertIsNOTDisabledType(serverA); + + ResourceType serviceB = getResourceType(new ResourceType("Service B", "Test1", ResourceCategory.SERVICE, null)); + assert serviceB != null; + assertIsDisabledType(serviceB); + + ResourceType serviceD = getResourceType(new ResourceType("Service D", "Test1", ResourceCategory.SERVICE, null)); + assert serviceD != null; + assertIsNOTDisabledType(serviceD); + + ResourceType serviceE = getResourceType(new ResourceType("Dependent Service E", "Test1", + ResourceCategory.SERVICE, null)); + assert serviceE != null; + assertIsDisabledType(serviceE); + + ResourceType serviceC = getResourceType(new ResourceType("Extension Service C", "Test2", + ResourceCategory.SERVICE, null)); + assert serviceC != null; + assertIsDisabledType(serviceC); + + ResourceType extB = getResourceType(new ResourceType("Extension Server B", "Test2", ResourceCategory.SERVER, + null)); + assert extB != null; + assertIsNOTDisabledType(extB); + + ResourceType serviceD2 = getResourceType(new ResourceType("Service D", "Test2", ResourceCategory.SERVICE, null)); + assert serviceD2 != null; + assertIsDisabledType(serviceD2); + + ResourceType extDtoA = getResourceType(new ResourceType("Injection D To Server A", "Test3", + ResourceCategory.SERVICE, null)); + assert extDtoA != null; + assertIsDisabledType(extDtoA); + + // Note this type has a <runs-inside> to more than one parent. Even though it is injected into + // multiple parent hierarchies, if you specify it in only one hierarchy, it will be disabled in all + // other hierarchies it is injected into. This could be considered a feature or not :-) + // For example, in this test, we have disabled the type: + // Test2>Extension Server B>Injection C To Server A + // but if we specified to disable this type (the second parent it was injected into), the same thing would result: + // Test1>Server A>Injection C To Server A + // Finally, if we specified the type as it was directly declared in its plugin, again, the same thing would result, + // this type is disabled for all of the hierarchies it was injected into. + // Test3>Injection C To Server A + ResourceType extCtoA = getResourceType(new ResourceType("Injection C To Server A", "Test3", + ResourceCategory.SERVICE, null)); + assert extCtoA != null; + assertIsDisabledType(extCtoA); + } + + private void assertIsDisabledType(ResourceType type) { + assert metadataManager.getDiscoveryClass(type).equals(this.disabledDiscoveryClazz); + assert metadataManager.getComponentClass(type).equals(this.disabledComponentClazz); + } + + private void assertIsNOTDisabledType(ResourceType type) { + assert !metadataManager.getDiscoveryClass(type).equals(this.disabledDiscoveryClazz); + assert !metadataManager.getComponentClass(type).equals(this.disabledComponentClazz); + } + + private ResourceType getResourceType(ResourceType typeToGet) { + for (ResourceType type : metadataManager.getAllTypes()) { + if (type.equals(typeToGet)) { + return type; + } + } + return null; + } + + private void outputTypes() { + Set<ResourceType> allTypes = metadataManager.getRootTypes(); + for (ResourceType type : allTypes) { + outputType(type, 0); + } + System.out.flush(); + } + + private void outputType(ResourceType type, int depth) { + StringBuilder line = new StringBuilder(); + for (int i = 0; i < depth; i++) { + line.append(" "); + } + + line.append("+ "); + line.append(type.toString()); + System.out.println(line.toString()); + for (ResourceType child : type.getChildResourceTypes()) { + outputType(child, depth + 1); + } + } +} \ No newline at end of file diff --git a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java index 6abeff3..fbb6b1b 100644 --- a/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java +++ b/modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java @@ -94,7 +94,7 @@ public class MetadataManagerTest { @Test(dependsOnMethods = "loadPluginDescriptorTest1") public void testDefinitionParsing1() { - ResourceType serverAType = this.metadataManager.getType("Server A", ResourceCategory.SERVER); + ResourceType serverAType = this.metadataManager.getType("Server A", "Test1"); assert serverAType.getName().equals("Server A"); assert serverAType.getPlugin().equals("Test1"); assertServerTypeIsOK(serverAType); @@ -122,7 +122,7 @@ public class MetadataManagerTest { @Test(dependsOnMethods = "loadPluginDescriptorTest2") public void testDefinitionParsing2() { - ResourceType serverBType = this.metadataManager.getType("Extension Server B", ResourceCategory.SERVER); + ResourceType serverBType = this.metadataManager.getType("Extension Server B", "Test2"); assert serverBType.getName().equals("Extension Server B"); assert serverBType.getPlugin().equals("Test2"); assertServerTypeIsOK(serverBType); diff --git a/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml b/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml index 35bc20a..f19b2f4 100644 --- a/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml +++ b/modules/core/client-api/src/test/resources/metadata-manager-test-2.xml @@ -6,9 +6,6 @@ <server name="Extension Server B" discovery="ServerBComponent" class="ServerBServerComponent" description="Extension Server B Test Server" sourcePlugin="Test1" sourceType="Server A"> - <service name="Service D" discovery="ServiceDComponent" class="ServiceDServerComponent" - description="Extension Service D Test Service" - sourcePlugin="Test1" sourceType="Service D"/> </server> diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java new file mode 100644 index 0000000..ddb9094 --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceComponent.java @@ -0,0 +1,48 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.pluginapi.inventory; + +import org.rhq.core.domain.measurement.AvailabilityType; + +/** + * This is used when a resource type is disabled. It simply will do no work + * and {@link #getAvailability()} will never show UP. + * + * @author John Mazzitelli + */ +@SuppressWarnings("rawtypes") +public class DisabledResourceComponent implements ResourceComponent { + + @Override + public AvailabilityType getAvailability() { + return AvailabilityType.DOWN; + } + + @Override + public void start(ResourceContext context) throws InvalidPluginConfigurationException, Exception { + } + + @Override + public void stop() { + } +} diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java new file mode 100644 index 0000000..17ca66a --- /dev/null +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DisabledResourceDiscoveryComponent.java @@ -0,0 +1,42 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.pluginapi.inventory; + +import java.util.Collections; +import java.util.Set; + +/** + * This is used when a resource type is disabled. When this discovery component is used for a type, + * it will simply not return any discovered resources. + * + * @author John Mazzitelli + */ +@SuppressWarnings("rawtypes") +public class DisabledResourceDiscoveryComponent implements ResourceDiscoveryComponent { + + @Override + public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) + throws InvalidPluginConfigurationException, Exception { + return Collections.emptySet(); + } +} diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java index e021d80..41dbda7 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java @@ -47,6 +47,7 @@ public class PluginContainerConfiguration { private static final String DATA_DIRECTORY_PROP = PROP_PREFIX + "data-directory"; private static final String TEMP_DIRECTORY_PROP = PROP_PREFIX + "temp-directory"; private static final String DISABLED_PLUGINS = PROP_PREFIX + "disabled-plugins"; + private static final String DISABLED_RESOURCE_TYPES = PROP_PREFIX + "disabled-resource-types"; private static final String ROOT_PLUGIN_CLASSLOADER_REGEX_PROP = PROP_PREFIX + "root-plugin-classloader-regex"; private static final String CREATE_RESOURCE_CLASSLOADERS = PROP_PREFIX + "create-resource-classloaders"; private static final String START_MANAGEMENT_BEAN_PROP = PROP_PREFIX + "start-management-bean"; @@ -238,6 +239,42 @@ public class PluginContainerConfiguration { } /** + * If any resource types are to be disabled, the resource types names will be returned + * in a list. + * Each type is listed as "plugin name>parent type>child type". + * If no types are to be disabled an empty list is returned. + * The returned list is a copy, not the actual list used internally. + * Note that the plugin name is the name found in the plugin .xml descriptor in the plugin root element. + * + * @return list of resource type names identifying types to be disabled + */ + @SuppressWarnings("unchecked") + public List<String> getDisabledResourceTypes() { + List<String> list = (List<String>) configuration.get(DISABLED_RESOURCE_TYPES); + if (list == null) { + return new ArrayList<String>(0); + } else { + return new ArrayList<String>(list); + } + } + + /** + * If one or more resource types are not to be loaded by the plugin container, the given + * list should be the names of the types to be disabled. + * Each type is listed as "plugin name>parent type>child type". + * Note that the plugin name is the name found in the plugin .xml descriptor in the plugin root element. + * + * @param disabledResourceTypes + */ + public void setDisabledResourceTypes(List<String> disabledResourceTypes) { + if (disabledResourceTypes != null) { + configuration.put(DISABLED_RESOURCE_TYPES, disabledResourceTypes); + } else { + configuration.remove(DISABLED_RESOURCE_TYPES); + } + } + + /** * Returns the regex that defines what classes the plugin container can provide to its * plugins from its own classloader and its parents. If not <code>null</code>, any classes * found in the plugin container's classloader (and its parent classloaders) that do diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java index a5d12a2..17d1565 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java @@ -45,6 +45,8 @@ import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; import org.rhq.core.domain.plugin.Plugin; import org.rhq.core.pc.ContainerService; import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pluginapi.inventory.DisabledResourceComponent; +import org.rhq.core.pluginapi.inventory.DisabledResourceDiscoveryComponent; import org.rhq.core.pluginapi.plugin.PluginContext; import org.rhq.core.pluginapi.plugin.PluginLifecycleListener; import org.rhq.core.system.SystemInfo; @@ -73,6 +75,8 @@ public class PluginManager implements ContainerService { } private static final Log log = LogFactory.getLog(PluginManager.class); + private static String DISABLED_DISCOVERY_COMPONENT_CLASS = DisabledResourceDiscoveryComponent.class.getName(); + private static String DISABLED_RESOURCE_COMPONENT_CLASS = DisabledResourceComponent.class.getName(); /** * The map of all plugins keyed on plugin name. @@ -103,6 +107,9 @@ public class PluginManager implements ContainerService { loadedPlugins = new ArrayList<Plugin>(); metadataManager = new PluginMetadataManager(); + metadataManager.setDisabledResourceTypes(configuration.getDisabledResourceTypes(), + DISABLED_DISCOVERY_COMPONENT_CLASS, DISABLED_RESOURCE_COMPONENT_CLASS); + initUpdateLoadedPluginsCallback(); PluginFinder finder = configuration.getPluginFinder(); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java index 6505648..939457a 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java @@ -1217,6 +1217,15 @@ public class AgentConfiguration { disabled_plugins = new ArrayList<String>(Arrays.asList(array)); } + // determine what, if any, resource types are to be disabled + String disabled_types_pref = m_preferences.get(AgentConfigurationConstants.PLUGINS_DISABLED_RESOURCE_TYPES, + null); + List<String> disabled_types = null; + if (disabled_types_pref != null) { + String[] array = disabled_types_pref.split("\\|"); + disabled_types = new ArrayList<String>(Arrays.asList(array)); + } + // Define what plugin container/agent classes are to be hidden from our plugins. String clRegex = m_preferences.get(AgentConfigurationConstants.PLUGINS_ROOT_PLUGIN_CLASSLOADER_REGEX, null); if (clRegex == null) { @@ -1232,6 +1241,7 @@ public class AgentConfiguration { config.setDataDirectory(data_directory); config.setTemporaryDirectory(tmp_directory); config.setDisabledPlugins(disabled_plugins); + config.setDisabledResourceTypes(disabled_types); config.setRootPluginClassLoaderRegex(clRegex); config.setServerDiscoveryInitialDelay(server_discovery_initial_delay); config.setServerDiscoveryPeriod(server_discovery_period); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java index 5f0b8ed..4fe7df9 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java @@ -549,6 +549,12 @@ public interface AgentConfigurationConstants { String PLUGINS_DISABLED = PROPERTY_NAME_PREFIX + "plugins.disabled"; /** + * The |-separated list of names of resource types that are to be disabled at startup. + * Values are things like "plugin name>parent>child>grandchild|plugin name2>type". + */ + String PLUGINS_DISABLED_RESOURCE_TYPES = PROPERTY_NAME_PREFIX + "plugins.disabled-resource-types"; + + /** * Defines, in seconds, the initial delay before the first server discovery scan is run. */ String PLUGINS_SERVER_DISCOVERY_INITIAL_DELAY = PROPERTY_NAME_PREFIX diff --git a/modules/enterprise/agent/src/main/resources/agent-configuration.xml b/modules/enterprise/agent/src/main/resources/agent-configuration.xml index 8ef78c9..61339fe 100644 --- a/modules/enterprise/agent/src/main/resources/agent-configuration.xml +++ b/modules/enterprise/agent/src/main/resources/agent-configuration.xml @@ -838,6 +838,24 @@ commands named "config", "setconfig" and "setup" and the command line options  +  + + <!-- + _______________________________________________________________ rhq.communications.configuration-schema-version Defines what version of the agent configuration schema this diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml index 01c0a41..a544775 100644 --- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml @@ -331,6 +331,7 @@ <c:simple-property name="rhq.agent.plugins.event-report.max-per-source" type="integer" activationPolicy="restart" required="false" default="200" displayName="Event Report Max Per Source" description="Defines the maximum number of events for any given event source that can be placed in a single event report that is sent up to the server. If this number is larger than the max-total setting, then this setting is ignored" /> <c:simple-property name="rhq.agent.plugins.event-report.max-total" type="integer" activationPolicy="restart" required="false" default="400" displayName="Event Report Max Total" description="Defines the total maximum number of events that can be placed in a single event report that is sent up to the server" /> <c:simple-property name="rhq.agent.plugins.disabled" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Plugins" description="Defines the plugins that should be disabled and not loaded by the plugin container. This is a comma-separated list of plugin names." /> + <c:simple-property name="rhq.agent.plugins.disabled-resource-types" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Resource Types" description="Defines the resource types that should be disabled and not used by the plugin container. This is a |-separated list of type names in the form of 'plugin name>parent type>child type'." /> </c:group> <c:group name="comm-endpoints" displayName="Communication Endpoints" hiddenByDefault="false"> <c:description>Communication settings that define the endpoints of this RHQ Agent and its RHQ Server</c:description> commit e052676858cfb0ca27692baf346914bf09c28f90 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:55:26 2013 -0500 Perf enhancement to mergeInventoryReport, replace Criteria calls with local named Query use because it ended up just being an ID search with no optional data. CP master: 807c358a4048bd47973177d63caa62197d1db6b9 diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index e266b83..1ac1423 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -37,13 +37,13 @@ import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.persistence.EntityManager; +import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.Query; import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.NotNull; import org.quartz.JobDataMap; import org.quartz.JobDetail; import org.quartz.Scheduler; @@ -453,7 +453,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot return result; } - @NotNull public MergeResourceResponse manuallyAddResource(Subject user, ResourceType resourceType, int parentResourceId, Configuration pluginConfiguration) throws InvalidPluginConfigurationClientException, PluginContainerException { if (!this.authorizationManager.hasResourcePermission(user, Permission.CREATE_CHILD_RESOURCES, parentResourceId)) { @@ -615,13 +614,13 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } /** - * @param resource + * @param resource NotNull * @param upgradeRequest * @param allowGenericPropertiesUpgrade name and description are only upgraded if this is true * @return response to the upgrade request detailing what has been accepted on the server side */ - private ResourceUpgradeResponse upgradeResource(@NotNull - Resource resource, ResourceUpgradeRequest upgradeRequest, boolean allowGenericPropertiesUpgrade) { + private ResourceUpgradeResponse upgradeResource(Resource resource, ResourceUpgradeRequest upgradeRequest, + boolean allowGenericPropertiesUpgrade) { if (upgradeRequest.getUpgradeErrorMessage() != null) { ResourceError error = new ResourceError(resource, ResourceErrorType.UPGRADE, upgradeRequest.getUpgradeErrorMessage(), upgradeRequest.getUpgradeErrorStackTrace(), @@ -717,16 +716,12 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot * <p>Does not require an existing transaction. The resource and each child will be merged in an isolated * transaction</p> * - * @param resource pojo, the resource to be merged, should have parent and children pojos set - * @param agent detached entity, the agent that should be set on the resource being merged + * @param resource NotNull pojo, the resource to be merged, should have parent and children pojos set + * @param agent NotNull detached entity, the agent that should be set on the resource being merged * * @throws InvalidInventoryReportException if a critical field in the resource is missing or invalid */ - private void mergeResource( // - @NotNull - Resource resource, // - @NotNull - Agent agent) throws InvalidInventoryReportException { + private void mergeResource(Resource resource, Agent agent) throws InvalidInventoryReportException { long start = System.currentTimeMillis(); @@ -842,6 +837,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot log.debug("getExistingResource processing for [" + resource + "]"); } + // We perform this query a lot during a large inventory merge, so minimize overhead by using it directly + Query query = entityManager.createNamedQuery(Resource.QUERY_FIND_BY_ID); Resource existingResource = null; Subject overlord = subjectManager.getOverlord(); @@ -850,17 +847,15 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot log.debug("Agent claims resource is already in inventory. Id=" + resource.getId()); } - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(resource.getId()); - criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter - List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); - if (!result.isEmpty()) { + try { + query.setParameter("resourceId", resource.getId()); + existingResource = (Resource) query.getSingleResult(); if (log.isDebugEnabled()) { log.debug("Found resource already in inventory. Id=" + resource.getId()); } - existingResource = result.get(0); + } catch (NoResultException e) { + existingResource = null; - } else { // agent lied - agent's copy of JON server inventory must be stale. if (log.isDebugEnabled()) { log.debug("However, no resource exists with the specified id. Id=" + resource.getId()); @@ -888,22 +883,26 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot while (null != parent && null == existingResource) { parent = parent.getParentResource(); - //check if the parent is in inventory. This might not be the case during initial sync-up for resource upgrade. + // check if the parent is in inventory. This might not be the case during initial sync-up for resource upgrade. Resource existingParent = null; if (null != parent) { - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(parent.getId()); - criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter - List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); - if (result.isEmpty()) { - //well, this parent is not known to the server, so there's no point in trying to find a child of it... - continue; + if (parent.getId() <= 0) { + log.warn("Expected potential parent resource to have a valid ID. Parent=" + parent + ", Child=" + + resource); + } + + try { + query.setParameter("resourceId", parent.getId()); + existingParent = (Resource) query.getSingleResult(); - } else { - existingParent = result.get(0); + } catch (NoResultException e) { + // this parent is not known to the server, so there's no point in trying to find a child of it... + continue; } } + // We found the parent in inventory, so now see if we can find this resource in inventory by using + // the parent, the resource key (unique among siblings), the plugin and the type. existingResource = resourceManager.getResourceByParentAndKey(overlord, existingParent, resource.getResourceKey(), resourceType.getPlugin(), resourceType.getName()); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java index 009c9e4..2560576 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java @@ -165,7 +165,7 @@ public interface DiscoveryBossLocal extends DiscoveryBossRemote { * @param parentResourceId the id of the resource that will be the parent of the manually discovered resource * @param pluginConfiguration the properties that should be used to connect to the underlying managed resource * - * @return the newly discovered resource with any associated {@link ResourceError} that might have occurred during + * @return NotNull the newly discovered resource with any associated {@link ResourceError} that might have occurred during * the activation of the resource * * @throws InvalidPluginConfigurationClientException if connecting to the underlying managed resource failed due to commit 675a024e57406f7d86987d3c5092397df4062b51 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:54:19 2013 -0500 make sure long-lasting inventory report merges don't step on each other. introduce a inventory report serializer Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java CP master: 5fede8e89c6748777e3ca0420906e1c750b214df diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/DiscoveryServerService.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/DiscoveryServerService.java index 86a0e90..6b2fba6 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/DiscoveryServerService.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/DiscoveryServerService.java @@ -61,7 +61,8 @@ public interface DiscoveryServerService { * @throws InvalidInventoryReportException if the inventory report contains invalid data */ @LimitedConcurrency(CONCURRENCY_LIMIT_INVENTORY_REPORT) - @Timeout(1000L * 60 * 30) + @Timeout(0L) + // should be something like 1000L * 60 * 30 but until we can be assured we never take longer, disable timeout ResourceSyncInfo mergeInventoryReport(InventoryReport inventoryReport) throws InvalidInventoryReportException, StaleTypeException; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java index 153144a..91c61af 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java @@ -68,9 +68,8 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { @Override public ResourceSyncInfo mergeInventoryReport(InventoryReport report) throws InvalidInventoryReportException, StaleTypeException { - long start = System.currentTimeMillis(); - DiscoveryBossLocal discoveryBoss = LookupUtil.getDiscoveryBoss(); - ResourceSyncInfo syncInfo; + + InventoryReportSerializer.getSingleton().lock(report.getAgent().getName()); try { syncInfo = discoveryBoss.mergeInventoryReport(report); } catch (InvalidInventoryReportException e) { @@ -84,23 +83,20 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { */ log.error("Received invalid inventory report from agent [" + agent + "]: " + e.getMessage()); } - throw e; - } catch (RuntimeException e) { - log.error( - "Fatal error occurred during merging of inventory report from agent [" + report.getAgent() + "].", e); - throw e; - } - long elapsed = (System.currentTimeMillis() - start); - if (elapsed > 30000L) { - log.warn("Performance: inventory merge (" + elapsed + ")ms"); - } else { - if (log.isDebugEnabled()) { - log.debug("Performance: inventory merge (" + elapsed + ")ms"); + long elapsed = (System.currentTimeMillis() - start); + if (elapsed > 30000L) { + log.warn("Performance: inventory merge (" + elapsed + ")ms"); + } else { + if (log.isDebugEnabled()) { + log.debug("Performance: inventory merge (" + elapsed + ")ms"); + } } - } - return syncInfo; + return syncInfo; + } finally { + InventoryReportSerializer.getSingleton().unlock(report.getAgent().getName()); + } } @Override diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/concurrent/InventoryReportSerializer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/concurrent/InventoryReportSerializer.java new file mode 100644 index 0000000..c5b9fbd --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/concurrent/InventoryReportSerializer.java @@ -0,0 +1,101 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.server.util.concurrent; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class InventoryReportSerializer { + private final Log log = LogFactory.getLog(InventoryReportSerializer.class); + + private static Map<String, ReentrantReadWriteLock> locks = new HashMap<String, ReentrantReadWriteLock>(); + private static Map<String, Long> lockTimes = Collections.synchronizedMap(new HashMap<String, Long>()); + private static InventoryReportSerializer singleton = new InventoryReportSerializer(); + + public static InventoryReportSerializer getSingleton() { + return singleton; + } + + public void lock(String agentName) { + String msg = "tid=" + Thread.currentThread().getId() + "; agent=" + agentName; + boolean debug = this.log.isDebugEnabled(); + + ReentrantReadWriteLock lock = null; + logDebug(debug, msg, ": about to synchronize"); + synchronized (this) { + logDebug(debug, msg, ": synchronized"); + lock = InventoryReportSerializer.locks.get(agentName); + if (lock == null) { + logDebug(debug, msg, ": creating new lock"); + lock = new ReentrantReadWriteLock(); + InventoryReportSerializer.locks.put(agentName, lock); + } + } + + logDebug(debug, msg, ": acquiring write lock"); + long start = System.currentTimeMillis(); + lock.writeLock().lock(); + long end = System.currentTimeMillis(); + long duration = end - start; + InventoryReportSerializer.lockTimes.put(agentName, Long.valueOf(end)); + if (duration < 5000L) { + logDebug(debug, msg, ": acquired write lock in millis=" + duration); + } else { + this.log.info(msg + ": acquired write lock in millis=" + duration); + } + + return; + } + + public void unlock(String agentName) { + String msg = "tid=" + Thread.currentThread().getId() + "; agent=" + agentName; + boolean debug = this.log.isDebugEnabled(); + + ReentrantReadWriteLock lock = InventoryReportSerializer.locks.get(agentName); + + if (lock != null) { + Long lockedTime = InventoryReportSerializer.lockTimes.get(agentName); + long duration = System.currentTimeMillis() - ((lockedTime != null) ? lockedTime : Long.MAX_VALUE); + + if (duration < 5000L) { + logDebug(debug, msg, ": releasing write lock after being locked for millis=" + duration); + } else { + this.log.info(msg + ": releasing write lock after being locked for millis=" + duration); + } + + lock.writeLock().unlock(); + logDebug(debug, msg, ": released write lock"); + } else { + this.log.warn(msg + ": cannot release write lock"); + } + + return; + } + + private void logDebug(boolean enabled, String arg1, String arg2) { + if (enabled) { + this.log.debug(arg1 + arg2); + } + } +} \ No newline at end of file commit d799907af8ab518dbc2681525a1b0bd2feded1d5 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:45:44 2013 -0500 Change batch looping strategy. Simplify range handling and perhaps help free memory as we chcunk through the batches. CP master: e9b36d00990f3f2c5f672a90493dd5c759c535af diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index aa93903..e266b83 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -744,15 +744,15 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot + "]"); //} - for (int i = 0, size = resourceList.size(); i < size;) { - int end = i + MERGE_BATCH_SIZE; - if (end > size) { - end = size; - } + while (!resourceList.isEmpty()) { + int size = resourceList.size(); + int end = (MERGE_BATCH_SIZE < size) ? MERGE_BATCH_SIZE : size; - List<Resource> resourceBatch = resourceList.subList(i, end); + List<Resource> resourceBatch = resourceList.subList(0, end); discoveryBoss.mergeResourceInNewTransaction(resourceBatch, agent); - i = end; + + // Advance our progress and possibly help GC. This will remove the processed resources from the backing list + resourceBatch.clear(); } // TODO: if (log.isDebugEnabled()) { commit 3ea1a19bbd0663a5fbf1bd598dfaf5f778037d9f Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:43:41 2013 -0500 trivial - fix log message CP master db26b01f174c721f361c2c17decc9ac56cb15ff3 diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index 7600409..aa93903 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -740,7 +740,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot List<Resource> resourceList = treeToBreadthFirstList(resource); // TODO: if (log.isDebugEnabled()) { - log.info("Preparing to merge [" + resourceList.size() + "Resources with a batch size of [" + MERGE_BATCH_SIZE + log.info("Preparing to merge [" + resourceList.size() + "] Resources with a batch size of [" + MERGE_BATCH_SIZE + "]"); //} commit 23d91e5266296ce050de7ae84c355a712952493c Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:42:28 2013 -0500 Rearrange things to allow for batching resource merge based on the rhq.server.discovery.merge.batch.size sysproperty. The default is 200 per transaction. Also, a variety of other optimizations to reduce the pull of unnecessary lazy data as well as the number of SLSB calls needing to establish their own transaction. CP master: 052a5a5f5378c912eabb916f364dd9e9ce9f8e6f diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index 884b64c..7600409 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -26,6 +26,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -43,7 +44,6 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.quartz.JobDataMap; import org.quartz.JobDetail; import org.quartz.Scheduler; @@ -108,6 +108,19 @@ import org.rhq.enterprise.server.util.LookupUtil; @Stateless public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemote { + static private final int MERGE_BATCH_SIZE; + + static { + + int mergeBatchSize = 200; + try { + mergeBatchSize = Integer.parseInt(System.getProperty("rhq.server.discovery.merge.batch.size", "200")); + } catch (Throwable t) { + // + } + MERGE_BATCH_SIZE = mergeBatchSize; + } + private final Log log = LogFactory.getLog(DiscoveryBossBean.class.getName()); @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) @@ -175,17 +188,13 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot continue; } - if ((root.getParentResource() != Resource.ROOT) && (root.getParentResource().getId() != Resource.ROOT_ID)) { - // This is a new resource that has a parent that already exists. - Resource parent = findExistingResource(root.getParentResource(), true, true); - assert parent != null; - mergeResource(root, parent, knownAgent); - - } else { - // This is a root resource. - mergeResource(root, Resource.ROOT, knownAgent); + if (Resource.ROOT != root.getParentResource() && Resource.ROOT_ID == root.getParentResource().getId()) { + // This is a root resource. Just set it that way + root.setParentResource(Resource.ROOT); } + mergeResource(root, knownAgent); + if (log.isDebugEnabled()) { log.debug("Root merged: resource/millis=" + root.getName() + '/' + (System.currentTimeMillis() - rootStart)); @@ -193,14 +202,12 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } // Prepare the ResourceSyncInfo tree which contains all the info the PC needs to sync itself up with us. - Resource platform = resourceManager.getPlatform(knownAgent); - - // the platform can be null in only one scenario.. a brand new agent has connected to the server + // The platform can be null in only one scenario.. a brand new agent has connected to the server // and that agent is currently trying to upgrade its resources. For that it asks us to send down // the current inventory on the server side. But at this point there isn't any since that very // agent just registered and is starting up for the very first time and therefore hasn't had // a chance yet to send us its full inventory report. - ResourceSyncInfo syncInfo = platform != null ? discoveryBoss.getResourceSyncInfo(platform.getId()) : null; + ResourceSyncInfo syncInfo = discoveryBoss.getResourceSyncInfo(knownAgent); if (log.isDebugEnabled()) { log.debug("Inventory merge completed in (" + (System.currentTimeMillis() - start) + ")ms"); @@ -210,8 +217,13 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } @Override - public ResourceSyncInfo getResourceSyncInfo(int resourceId) { - ResourceSyncInfo result = entityManager.find(ResourceSyncInfo.class, resourceId); + public ResourceSyncInfo getResourceSyncInfo(Agent knownAgent) { + Resource platform = resourceManager.getPlatform(knownAgent); + if (null == platform) { + return null; + } + + ResourceSyncInfo result = entityManager.find(ResourceSyncInfo.class, platform.getId()); return result; } @@ -488,7 +500,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot + resource.getResourceType()); } - Resource existingResource = findExistingResource(resource, false, false); + Resource existingResource = findExistingResource(resource); if (existingResource != null) { mergeResourceResponse = new MergeResourceResponse(existingResource.getId(), true); } else { @@ -696,17 +708,16 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } /** - * <p>Not In Transaction</p> + * <p>Should Not Be Called With Existing Transaction !!!</p> * - * <p>Merges the specified resource and its children into inventory If the resource already exists in inventory, + * <p>Merges the specified resource and its children into inventory. If the resource already exists in inventory, * it is updated; if it does not already exist in inventory, it is added and its parent is set to the specified, already inventoried, * parent resource.</p> * * <p>Does not require an existing transaction. The resource and each child will be merged in an isolated * transaction</p> * - * @param resource pojo, the resource to be merged - * @param parentResource detached entity, parent of resource to be merged + * @param resource pojo, the resource to be merged, should have parent and children pojos set * @param agent detached entity, the agent that should be set on the resource being merged * * @throws InvalidInventoryReportException if a critical field in the resource is missing or invalid @@ -714,8 +725,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot private void mergeResource( // @NotNull Resource resource, // - @Nullable - Resource parentResource, // @NotNull Agent agent) throws InvalidInventoryReportException { @@ -725,28 +734,87 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot log.debug("Merging [" + resource + "]..."); } - // Even though we may end up fetching an existing resource more than once (detached here, attached later, - // it's a necessary evil, as this call is not just a straightforward id fetch. - Resource existingResource = findExistingResource(resource, false, false); + // We don't merge the entire resource tree. Instead we batch them in order to reduce transaction overhead + // while ensuring no transaction is too big (and thus risks timeout). To do this we need to flatten the + // tree and chunk through it. Parents must be merged before children, so use a breadth first approach. + List<Resource> resourceList = treeToBreadthFirstList(resource); - if (null != existingResource) { - updatePreviouslyInventoriedResource(resource, existingResource); + // TODO: if (log.isDebugEnabled()) { + log.info("Preparing to merge [" + resourceList.size() + "Resources with a batch size of [" + MERGE_BATCH_SIZE + + "]"); + //} - } else { - presetAgent(resource, agent); - addResourceToInventory(resource, parentResource); + for (int i = 0, size = resourceList.size(); i < size;) { + int end = i + MERGE_BATCH_SIZE; + if (end > size) { + end = size; + } + + List<Resource> resourceBatch = resourceList.subList(i, end); + discoveryBoss.mergeResourceInNewTransaction(resourceBatch, agent); + i = end; } - if (log.isDebugEnabled()) { - log.debug("Resource merged: resource/millis=" + resource.getName() + '/' + // TODO: if (log.isDebugEnabled()) { + log.info("Resource and children merged: resource/millis=" + resource.getName() + '/' + + (System.currentTimeMillis() - start)); + //} + + return; + } + + private List<Resource> treeToBreadthFirstList(Resource resource) { + List<Resource> result = new ArrayList<Resource>(MERGE_BATCH_SIZE); + + LinkedList<Resource> queue = new LinkedList<Resource>(); + queue.add(resource); + while (!queue.isEmpty()) { + Resource node = queue.remove(); + result.add(node); + for (Resource child : node.getChildResources()) { + queue.add(child); + } + } + + return result; + } + + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void mergeResourceInNewTransaction(List<Resource> resourceBatch, Agent agent) + throws InvalidInventoryReportException { + + long batchStart = System.currentTimeMillis(); + + for (Resource resource : resourceBatch) { + Resource existingResource = null; + long start = System.currentTimeMillis(); + + existingResource = findExistingResource(resource); + + // Does this resource already exist in inventory? If so, update, otherwise add + if (null != existingResource) { + updateExistingResourceInNewTransaction(resource, existingResource); + + } else { + presetAgent(resource, agent); + persistResourceInNewTransaction(resource); + } + + //TODO: if (log.isDebugEnabled()) { + log.info("Single Resource merged: resource/millis=" + resource.getName() + '/' + (System.currentTimeMillis() - start)); + //} } - return; + + //TODO: if (log.isDebugEnabled()) { + long delta = (System.currentTimeMillis() - batchStart); + log.info("Resource Batch merged: size/average/millis=" + resourceBatch.size() + "/" + delta + / resourceBatch.size() + "/" + delta); + //} } /** - * <p>Not In Transaction</p> - * * Recursively set the agent on the resource tree. * * @param resource pojo, the parent @@ -765,13 +833,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot * cannot be found either via ID or resource key then SIDE EFFECT: the given resource's ID will be reset to 0 and null * will be returned. * - * @param resource Pojo containing resource id, key, parent (if it exists) - * @param fetchParent - * @parent fetchChildren - * @return the (detached) Resource entity found in the database and matching the given resource. Parent and Child - * resources will be set on the resource. + * @param resource Pojo containing resourceId, key, and parentResoure (if applicable) + * @return the Resource entity found in the database and matching the given resource. */ - private Resource findExistingResource(Resource resource, boolean fetchParent, boolean fetchChildren) { + private Resource findExistingResource(Resource resource) { if (log.isDebugEnabled()) { log.debug("getExistingResource processing for [" + resource + "]"); @@ -788,8 +853,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterId(resource.getId()); criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter - criteria.fetchParentResource(fetchParent); // OK because we are calling as overlord - criteria.fetchChildResources(fetchChildren); // OK because we are calling as overlord List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); if (!result.isEmpty()) { if (log.isDebugEnabled()) { @@ -816,7 +879,9 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot + ", key=" + resource.getResourceKey()); } - // not sure I understand this while-loop bit (jshaughn), please comment if you know what is happening here + // (jshaughn) I'm not 100% sure I understand the need for this while loop, but I believe it has to + // do with handling the case in which a resource type has moved (see f74b22044) and trying to + // relocate the parent. Anyway, I'm not going to touch it even though it slows things down. ResourceType resourceType = resource.getResourceType(); Resource parent = resource; @@ -850,17 +915,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot log.debug("Found resource already in inventory with specified business key, Id=" + resource.getId()); } - // fetch the children, they are not yet fetched - if (fetchParent || fetchChildren) { - ResourceCriteria criteria = new ResourceCriteria(); - criteria.addFilterId(existingResource.getId()); - criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter - criteria.fetchParentResource(fetchParent); // OK because we are calling as overlord - criteria.fetchChildResources(fetchChildren); // OK because we are calling as overlord - List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); - existingResource = result.get(0); - } - } else { log.debug("Unable to find the agent-reported resource by id or business key."); @@ -881,21 +935,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot return existingResource; } - private void updatePreviouslyInventoriedResource(Resource updatedResource, Resource existingResource) - throws InvalidInventoryReportException { - - discoveryBoss.updateExistingResourceInNewTransaction(updatedResource, existingResource); - - for (Resource childResource : updatedResource.getChildResources()) { - mergeResource(childResource, existingResource, existingResource.getAgent()); - } - - return; - } - - @Override - @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - public void updateExistingResourceInNewTransaction(Resource updatedResource, Resource existingResource) + private void updateExistingResourceInNewTransaction(Resource updatedResource, Resource existingResource) throws InvalidInventoryReportException { /* * there exists a small window of time after the synchronous part of the uninventory and before the async @@ -1038,42 +1078,16 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot return true; } - /** - * <p>Not In Transaction</p> - * - * Add the resource to the existing parent and recursively do the same for all children. Each resource - * will be persisted in a separate transaction to ensure one overly long transaction does nottake place for - * a large resource tree. - * - * @param Pojo, resource - * @param Detached entity, parentResource - */ - private void addResourceToInventory(Resource resource, Resource parentResource) { - if (log.isDebugEnabled()) { - log.debug("New resource [" + resource + "] reported - adding to inventory with status 'NEW'..."); - } - - initAutoDiscoveredResource(resource, parentResource); - - persistResourceToInventory(resource, parentResource); - } - - private void persistResourceToInventory(Resource resource, Resource parentResource) { + private void persistResourceInNewTransaction(Resource resource) { - discoveryBoss.persistResourceInNewTransaction(resource, parentResource); - - for (Resource child : resource.getChildResources()) { - persistResourceToInventory(child, resource); - } - } - - @Override - @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - public void persistResourceInNewTransaction(Resource resource, Resource parentResource) { + Resource parentResource = resource.getParentResource(); if (null != parentResource) { - parentResource = entityManager.find(Resource.class, parentResource.getId()); - parentResource.addChildResource(resource); + // Find the parent resource entity and create the parent-child relationship + parentResource = findExistingResource(parentResource); + if (null != parentResource) { + parentResource.addChildResource(resource); + } } entityManager.persist(resource); @@ -1085,36 +1099,28 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot resource.setProductVersion(productVersion); } - // Extend implicit (recursive) group membership of the parent to the new child - if (null != parentResource) { - groupManager.updateImplicitGroupMembership(subjectManager.getOverlord(), resource); - } - } + // Ensure the new resource has an owner and modifier of superUser. + Subject overlord = subjectManager.getOverlord(); - /** - * <p>Not In Transaction</p> - * - * Before adding a new auto-discovered resource to inventory, ensure that it, and all its descendants, has - * the proper inventory status and an owner and modifier of superUser. - * - * @param resource Pojo - * @param parent Pojo - */ - private void initAutoDiscoveredResource(Resource resource, Resource parent) { - if ((resource.getParentResource() != null) - && (resource.getParentResource().getInventoryStatus() == InventoryStatus.COMMITTED) - && ((resource.getResourceType().getCategory() == ResourceCategory.SERVICE) || (resource.getParentResource() + resource.setItime(System.currentTimeMillis()); + resource.setModifiedBy(overlord.getName()); + + // Ensure the new resource has the proper inventory status + if ((null != parentResource) + && (parentResource.getInventoryStatus() == InventoryStatus.COMMITTED) + && ((resource.getResourceType().getCategory() == ResourceCategory.SERVICE) || (parentResource .getResourceType().getCategory() == ResourceCategory.SERVER))) { + // Auto-commit services whose parent resources have already been imported by the user resource.setInventoryStatus(InventoryStatus.COMMITTED); + } else { resource.setInventoryStatus(InventoryStatus.NEW); } - resource.setItime(System.currentTimeMillis()); - resource.setModifiedBy(subjectManager.getOverlord().getName()); - for (Resource childResource : resource.getChildResources()) { - initAutoDiscoveredResource(childResource, resource); + // Extend implicit (recursive) group membership of the parent to the new child + if (null != parentResource) { + groupManager.updateImplicitGroupMembership(overlord, resource); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java index 65e995f..009c9e4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java @@ -37,6 +37,7 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; +import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceError; @@ -63,29 +64,21 @@ public interface DiscoveryBossLocal extends DiscoveryBossRemote { /** * <p>Exists for transactional boundary reasons only.</p> + * + * Merge In the provided batch of resources. The list of resources must provide a parent before its child. * - * @param updatedResource - * @param existingResource + * @param resourceBatch + * @param agent * @throws InvalidInventoryReportException */ - void updateExistingResourceInNewTransaction(Resource updatedResource, Resource existingResource) + void mergeResourceInNewTransaction(List<Resource> resourceBatch, Agent agent) throws InvalidInventoryReportException; /** - * <p>Exists for transactional boundary reasons only.</p> - * - * Persist the resource and optionally create a child relationship with the existing parent. - * - * @param Pojo, resource - * @param Detached entity, parentResource - */ - void persistResourceInNewTransaction(Resource resource, Resource parentResource); - - /** - * @param resourceId - * @return null if not found + * @param knownAgent the agent for the platform we want to sync with + * @return null if platform not found */ - ResourceSyncInfo getResourceSyncInfo(int resourceId); + ResourceSyncInfo getResourceSyncInfo(Agent knownAgent); /** * Returns a map of platforms (the keys) and their servers (the values) that are in the auto-discovery queue but not commit e940fc0b07197926eec061516163265ab0ee7ce5 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:40:14 2013 -0500 [Bug 902406 - large number of services cause inventory report to not get processed] - Clarify behavior of ResourceManager.createResource in the jdoc. - Fix testcode depending on false assumption of cascase persist CP master: af32375e7c21e803d16f6fba42cb0dd069465f1e diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java index f555116..6d320c5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java @@ -65,7 +65,8 @@ import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException; @Local public interface ResourceManagerLocal { /** - * Create a new Resource. + * Create a new Resource. This method creates only the supplied Resource, it will *NOT* create + * the parent or any childResources. * * @param user the user creating the resource * @param resource the resource to be created diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java index dd05cd6..7a5207f 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java @@ -216,16 +216,21 @@ public class UpdateResourceTypeSubsystemTest extends UpdatePluginMetadataTestBas try { registerPlugin("update2-v1_0.xml"); + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + ResourceType platform1 = getResourceType("myPlatform"); Resource platformResource = createResource("foo-myPlatform", "foo-myPlatform", platform1); + resourceManager.createResource(overlord, platformResource, -1); + ResourceType service1 = getResourceType("service1"); Resource service1Resource = createResource("foo-service1", "foo-service1", service1); platformResource.addChildResource(service1Resource); + resourceManager.createResource(overlord, service1Resource, -1); + ResourceType nestedOne = getResourceType("nestedOne"); Resource nestedOneResource = createResource("foo-nestedOne", "foo-nestedOne", nestedOne); service1Resource.addChildResource(nestedOneResource); - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - resourceManager.createResource(overlord, platformResource, -1); + resourceManager.createResource(overlord, nestedOneResource, -1); getTransactionManager().begin(); EntityManager em = getEntityManager(); commit 656653bb6e2ee18ba5bf5ef88424b7135945144c Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:39:01 2013 -0500 [Bug 902406 - large number of services cause inventory report to not get processed] Since we're in the act of merging into inventory, disable the default InventoryStatus filter on the Resource criteria searches. cherry-pick of master: 8d0c980f8ce83106977781dc65725dc1a0427569 diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index d321a73..884b64c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -787,6 +787,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterId(resource.getId()); + criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter criteria.fetchParentResource(fetchParent); // OK because we are calling as overlord criteria.fetchChildResources(fetchChildren); // OK because we are calling as overlord List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); @@ -827,6 +828,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (null != parent) { ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterId(parent.getId()); + criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); if (result.isEmpty()) { //well, this parent is not known to the server, so there's no point in trying to find a child of it... @@ -852,6 +854,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (fetchParent || fetchChildren) { ResourceCriteria criteria = new ResourceCriteria(); criteria.addFilterId(existingResource.getId()); + criteria.addFilterInventoryStatus(null); // Don't filter on COMMITTED, disable the default filter criteria.fetchParentResource(fetchParent); // OK because we are calling as overlord criteria.fetchChildResources(fetchChildren); // OK because we are calling as overlord List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); @@ -999,11 +1002,11 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (null == resourceType) { try { - ResourceTypeCriteria c = new ResourceTypeCriteria(); - c.addFilterPluginName(plugin); - c.addFilterName(name); + ResourceTypeCriteria criteria = new ResourceTypeCriteria(); + criteria.addFilterPluginName(plugin); + criteria.addFilterName(name); List<ResourceType> result = resourceTypeManager.findResourceTypesByCriteria( - subjectManager.getOverlord(), c); + subjectManager.getOverlord(), criteria); if (!result.isEmpty()) { resourceType = result.get(0); commit f6364d5b98dd03f6a3c0ca89b83b4a93de578ef5 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jan 28 14:37:43 2013 -0500 [Bug 902406 - large number of services cause inventory report to not get processed] Break up the single-transaction approach of DiscoveryBossBean.mergeInventoryReport() into a transaction for each resource being merged. This should prevent a long-running transaction time dependent on the inventory report size. Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java Cherry-pick of master commit: 22053b3794a724a1fa997df07684ed14dd55b564 diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java index 46383f3..8a9fe26 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java @@ -972,9 +972,9 @@ public class Resource implements Comparable<Resource>, Serializable { @Summary(index = 4) private ResourceType resourceType; - // do not cascade remove; it would take forever to delete a full platform hierarchy, - // so we will manually delete the children ourselves - @OneToMany(mappedBy = "parentResource", fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST }) + // Do not cascade remove; it would take forever to delete a full platform hierarchy, we delete the children + // Do not cascade persist; large child sets can take prohibitively long, we manually persist the children + @OneToMany(mappedBy = "parentResource", fetch = FetchType.LAZY) @OrderBy // primary key private Set<Resource> childResources; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index 2511d28..d321a73 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -42,7 +42,6 @@ import javax.security.auth.login.LoginException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.Hibernate; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.quartz.JobDataMap; @@ -65,6 +64,7 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; import org.rhq.core.domain.resource.Agent; @@ -103,6 +103,7 @@ import org.rhq.enterprise.server.util.LookupUtil; * * @author Ian Springer * @author Greg Hinkle + * @author Jay Shaughnessy */ @Stateless public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemote { @@ -136,6 +137,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot @EJB private PluginManagerLocal pluginManager; + // Do not start in a transaction. A single transaction may timeout if the report size is too large + @TransactionAttribute(TransactionAttributeType.NEVER) public ResourceSyncInfo mergeInventoryReport(InventoryReport report) throws InvalidInventoryReportException { validateInventoryReport(report); @@ -171,20 +174,18 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (!initResourceTypes(root)) { continue; } + if ((root.getParentResource() != Resource.ROOT) && (root.getParentResource().getId() != Resource.ROOT_ID)) { // This is a new resource that has a parent that already exists. - Resource parent = getExistingResource(root.getParentResource()); + Resource parent = findExistingResource(root.getParentResource(), true, true); assert parent != null; mergeResource(root, parent, knownAgent); + } else { // This is a root resource. mergeResource(root, Resource.ROOT, knownAgent); } - // Do NOT delete this flush+clear - it greatly improves performance. - entityManager.flush(); - entityManager.clear(); - if (log.isDebugEnabled()) { log.debug("Root merged: resource/millis=" + root.getName() + '/' + (System.currentTimeMillis() - rootStart)); @@ -192,15 +193,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } // Prepare the ResourceSyncInfo tree which contains all the info the PC needs to sync itself up with us. - Resource platform = this.resourceManager.getPlatform(knownAgent); + Resource platform = resourceManager.getPlatform(knownAgent); - //the platform can be null in only one scenario.. a brand new agent has connected to the server - //and that agent is currently trying to upgrade its resources. For that it asks us to send down - //the current inventory on the server side. But at this point there isn't any since that very - //agent just registered and is starting up for the very first time and therefore hasn't had - //a chance yet to send us its full inventory report. - ResourceSyncInfo syncInfo = platform != null ? this.entityManager - .find(ResourceSyncInfo.class, platform.getId()) : null; + // the platform can be null in only one scenario.. a brand new agent has connected to the server + // and that agent is currently trying to upgrade its resources. For that it asks us to send down + // the current inventory on the server side. But at this point there isn't any since that very + // agent just registered and is starting up for the very first time and therefore hasn't had + // a chance yet to send us its full inventory report. + ResourceSyncInfo syncInfo = platform != null ? discoveryBoss.getResourceSyncInfo(platform.getId()) : null; if (log.isDebugEnabled()) { log.debug("Inventory merge completed in (" + (System.currentTimeMillis() - start) + ")ms"); @@ -209,6 +209,12 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot return syncInfo; } + @Override + public ResourceSyncInfo getResourceSyncInfo(int resourceId) { + ResourceSyncInfo result = entityManager.find(ResourceSyncInfo.class, resourceId); + return result; + } + @RequiredPermission(Permission.MANAGE_INVENTORY) public Map<Resource, List<Resource>> getQueuedPlatformsAndServers(Subject user, PageControl pc) { return getQueuedPlatformsAndServers(user, EnumSet.of(InventoryStatus.NEW), pc); @@ -354,8 +360,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot * The agent will sync status and determine what other sync work needs to be * performed. * - * @param platforms the inventoried platforms - * @param servers the inventoried servers + * @param platforms the platforms in inventory + * @param servers the servers in inventory */ public void updateAgentInventoryStatus(List<Resource> platforms, List<Resource> servers) { for (Resource platform : platforms) { @@ -447,8 +453,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot if (!resourceType.isSupportsManualAdd()) { throw new RuntimeException("Cannot manually add " + resourceType + " child Resource under parent " - + parentResource + ", since the " + resourceType - + " type does not support manual add."); + + parentResource + ", since the " + resourceType + " type does not support manual add."); } abortResourceManualAddIfExistingSingleton(parentResource, resourceType); @@ -457,14 +462,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot try { AgentClient agentClient = this.agentManager.getAgentClient(parentResource.getAgent()); DiscoveryAgentService discoveryAgentService = agentClient.getDiscoveryAgentService(); - mergeResourceResponse = discoveryAgentService.manuallyAddResource(resourceType, - parentResourceId, pluginConfiguration, user.getId()); + mergeResourceResponse = discoveryAgentService.manuallyAddResource(resourceType, parentResourceId, + pluginConfiguration, user.getId()); } catch (CannotConnectException e) { - throw new CannotConnectToAgentException("Error adding [" + resourceType + "] Resource to inventory as " + - "a child of " + parentResource + " - cause: " + e.getMessage(), e); + throw new CannotConnectToAgentException("Error adding [" + resourceType + "] Resource to inventory as " + + "a child of " + parentResource + " - cause: " + e.getMessage(), e); } catch (RuntimeException e) { - throw new RuntimeException("Error adding [" + resourceType - + "] Resource to inventory as a child of " + parentResource + " - cause: " + e, e); + throw new RuntimeException("Error adding [" + resourceType + "] Resource to inventory as a child of " + + parentResource + " - cause: " + e, e); } return mergeResourceResponse; @@ -483,7 +488,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot + resource.getResourceType()); } - Resource existingResource = getExistingResource(resource); + Resource existingResource = findExistingResource(resource, false, false); if (existingResource != null) { mergeResourceResponse = new MergeResourceResponse(existingResource.getId(), true); } else { @@ -553,7 +558,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } /** - * Convienence method that looks at <code>resource</code> and if its version is not + * Convenience method that looks at <code>resource</code> and if its version is not * the same as <code>newVersion</code>, its version string will be set to it. If * the resource's version was different and was changed by this method, <code>true</code> * will be returned. @@ -564,7 +569,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot * @return <code>true</code> if the resource's version was not <code>newVersion</code> and was * changed to it. <code>false</code> if the version was already the same as <code>newVersion</code> * or <code>resource</code> was <code>null</code>. In other words, this returns <code>true</code> - * iff the resource's version was actually changed. + * if the resource's version was actually changed. */ private boolean updateResourceVersion(Resource resource, String newVersion) { boolean versionChanged = false; @@ -603,8 +608,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot * @param allowGenericPropertiesUpgrade name and description are only upgraded if this is true * @return response to the upgrade request detailing what has been accepted on the server side */ - private ResourceUpgradeResponse upgradeResource(@NotNull Resource resource, ResourceUpgradeRequest upgradeRequest, - boolean allowGenericPropertiesUpgrade) { + private ResourceUpgradeResponse upgradeResource(@NotNull + Resource resource, ResourceUpgradeRequest upgradeRequest, boolean allowGenericPropertiesUpgrade) { if (upgradeRequest.getUpgradeErrorMessage() != null) { ResourceError error = new ResourceError(resource, ResourceErrorType.UPGRADE, upgradeRequest.getUpgradeErrorMessage(), upgradeRequest.getUpgradeErrorStackTrace(), @@ -642,8 +647,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } ret.setUpgradedResourceDescription(resource.getDescription()); - //finally let's remove the potential previous upgrade error. we've now successfully - //upgraded the resource. + // finally let's remove the potential previous upgrade error. we've now successfully + // upgraded the resource. List<ResourceError> upgradeErrors = resourceManager.findResourceErrors(subjectManager.getOverlord(), resource.getId(), ResourceErrorType.UPGRADE); for (ResourceError error : upgradeErrors) { @@ -664,6 +669,10 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } } + /** + * @param resource This can be a detached object + * @throws InvalidInventoryReportException + */ private void validateResource(Resource resource) throws InvalidInventoryReportException { if (resource.getResourceType() == null) { throw new InvalidInventoryReportException("Reported resource [" + resource + "] has a null type."); @@ -687,25 +696,42 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } /** - * Merges the specified resource into inventory. If the resource already exists in inventory, it is updated; if it - * does not already exist in inventory, it is added and its parent is set to the specified, already inventoried, - * parent resource. + * <p>Not In Transaction</p> + * + * <p>Merges the specified resource and its children into inventory If the resource already exists in inventory, + * it is updated; if it does not already exist in inventory, it is added and its parent is set to the specified, already inventoried, + * parent resource.</p> + * + * <p>Does not require an existing transaction. The resource and each child will be merged in an isolated + * transaction</p> * - * @param resource the resource to be merged - * @param parentResource the inventoried resource that should be the parent of the resource to be merged - * @param agent the agent that should be set on the resource being merged + * @param resource pojo, the resource to be merged + * @param parentResource detached entity, parent of resource to be merged + * @param agent detached entity, the agent that should be set on the resource being merged * * @throws InvalidInventoryReportException if a critical field in the resource is missing or invalid */ - private void mergeResource(@NotNull Resource resource, @Nullable Resource parentResource, @NotNull Agent agent) - throws InvalidInventoryReportException { + private void mergeResource( // + @NotNull + Resource resource, // + @Nullable + Resource parentResource, // + @NotNull + Agent agent) throws InvalidInventoryReportException { + long start = System.currentTimeMillis(); - log.debug("Merging [" + resource + "]..."); - Resource existingResource = getExistingResource(resource); + if (log.isDebugEnabled()) { + log.debug("Merging [" + resource + "]..."); + } - if (existingResource != null) { + // Even though we may end up fetching an existing resource more than once (detached here, attached later, + // it's a necessary evil, as this call is not just a straightforward id fetch. + Resource existingResource = findExistingResource(resource, false, false); + + if (null != existingResource) { updatePreviouslyInventoriedResource(resource, existingResource); + } else { presetAgent(resource, agent); addResourceToInventory(resource, parentResource); @@ -718,6 +744,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot return; } + /** + * <p>Not In Transaction</p> + * + * Recursively set the agent on the resource tree. + * + * @param resource pojo, the parent + * @param agent pojo, the agent + */ private void presetAgent(Resource resource, Agent agent) { resource.setAgent(agent); for (Resource child : resource.getChildResources()) { @@ -728,96 +762,138 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot /** * Given a resource, will attempt to find it in the server's inventory (that is, finds it in the database). If the * given resource's ID does not exist in the database, it will be looked up by its resource key. If the resource - * cannot be found either via ID or resource key, the given resource's ID will be reset to 0 and null will be - * returned. - * - * @param resource the resource to find in the server's inventory (the database) + * cannot be found either via ID or resource key then SIDE EFFECT: the given resource's ID will be reset to 0 and null + * will be returned. * - * @return the existing resource found in the database that matches that of the given resource + * @param resource Pojo containing resource id, key, parent (if it exists) + * @param fetchParent + * @parent fetchChildren + * @return the (detached) Resource entity found in the database and matching the given resource. Parent and Child + * resources will be set on the resource. */ - private Resource getExistingResource(Resource resource) { - Resource existingResource = null; + private Resource findExistingResource(Resource resource, boolean fetchParent, boolean fetchChildren) { - log.debug("getExistingResource processing for [" + resource + "]"); + if (log.isDebugEnabled()) { + log.debug("getExistingResource processing for [" + resource + "]"); + } - String idLogMsg = "id=" + resource.getId(); + Resource existingResource = null; + Subject overlord = subjectManager.getOverlord(); if (resource.getId() != 0) { - log.debug(idLogMsg + ": Agent claims resource is already in inventory."); - - /* agent says this resource is already in inventory. - * - * note: we intentionally do not use ResourceManager.getResourceById() here, because if it were to throw a - * ResourceNotFoundException, it would cause a tx rollback (ips, 05/09/07). - */ - existingResource = entityManager.find(Resource.class, resource.getId()); - if (existingResource == null) { - // agent lied - agent's copy of JON server inventory must be stale. - log.debug(idLogMsg + ": However, no resource exists with the specified id."); + if (log.isDebugEnabled()) { + log.debug("Agent claims resource is already in inventory. Id=" + resource.getId()); + } + + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterId(resource.getId()); + criteria.fetchParentResource(fetchParent); // OK because we are calling as overlord + criteria.fetchChildResources(fetchChildren); // OK because we are calling as overlord + List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); + if (!result.isEmpty()) { + if (log.isDebugEnabled()) { + log.debug("Found resource already in inventory. Id=" + resource.getId()); + } + existingResource = result.get(0); + } else { - log.debug(idLogMsg + ": Found resource already in inventory with specified id"); + // agent lied - agent's copy of JON server inventory must be stale. + if (log.isDebugEnabled()) { + log.debug("However, no resource exists with the specified id. Id=" + resource.getId()); + } } } else { - log.debug(idLogMsg + ": Agent reported resource with id of 0."); + log.debug("Agent reported resource with id of 0"); } + // If necessary double-check for an existing resource using the business key. + // this will happen if the agent found the resource (non-zero id) but the DB didn't know about it, + // or if the agent didn't know about it to begin with (id was 0). if (existingResource == null) { - log.debug(idLogMsg + ": Checking if a resource exists with the specified business key."); - - /* - * double-check for an existing resource using the business key. - * - * this will happen if the agent found the resource (non-zero id) but the entityManager didn't know about it, - * or if the agent didn't know about it to begin with (id was 0). - */ + if (log.isDebugEnabled()) { + log.debug("Checking if a resource exists with the specified business key. Id=" + resource.getId() + + ", key=" + resource.getResourceKey()); + } + + // not sure I understand this while-loop bit (jshaughn), please comment if you know what is happening here ResourceType resourceType = resource.getResourceType(); Resource parent = resource; - Subject overlord = subjectManager.getOverlord(); - while (parent != null && existingResource == null) { + + while (null != parent && null == existingResource) { parent = parent.getParentResource(); - //check if the parent itself is inventoried. This might not be the case - //during initial sync-up for resource upgrade. + + //check if the parent is in inventory. This might not be the case during initial sync-up for resource upgrade. Resource existingParent = null; - if (parent != null) { - existingParent = entityManager.find(Resource.class, parent.getId()); - if (existingParent == null) { - //well, this parent is not known to the server, so there's no - //point in trying to find a child of it... + if (null != parent) { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterId(parent.getId()); + List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); + if (result.isEmpty()) { + //well, this parent is not known to the server, so there's no point in trying to find a child of it... continue; + + } else { + existingParent = result.get(0); } } + existingResource = resourceManager.getResourceByParentAndKey(overlord, existingParent, resource.getResourceKey(), resourceType.getPlugin(), resourceType.getName()); } - if (existingResource != null) { + if (null != existingResource) { // We found it - reset the id to what it should be. resource.setId(existingResource.getId()); - log.debug(idLogMsg + ": Found resource already in inventory with specified business key"); + if (log.isDebugEnabled()) { + log.debug("Found resource already in inventory with specified business key, Id=" + resource.getId()); + } + + // fetch the children, they are not yet fetched + if (fetchParent || fetchChildren) { + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterId(existingResource.getId()); + criteria.fetchParentResource(fetchParent); // OK because we are calling as overlord + criteria.fetchChildResources(fetchChildren); // OK because we are calling as overlord + List<Resource> result = resourceManager.findResourcesByCriteria(overlord, criteria); + existingResource = result.get(0); + } + } else { - log.debug(idLogMsg + ": Unable to find the agent-reported resource by id or business key."); + log.debug("Unable to find the agent-reported resource by id or business key."); if (resource.getId() != 0) { // existingResource is still null at this point, the resource does not exist in inventory. - log.error(idLogMsg + ": Resetting the resource's id to zero."); + log.error("Resetting the resource's id to zero. Previous Id=" + resource.getId()); resource.setId(0); // TODO: Is there anything else we should do here to inform the agent it has an out-of-sync resource? + } else { - log.debug(idLogMsg + ": Resource's id was already zero, nothing to do for the merge."); + if (log.isDebugEnabled()) { + log.debug("Resource's id was already zero, nothing to do for the merge."); + } } } } - if (existingResource != null) { - // eager load child resources to avoid later failures in adding children - Hibernate.initialize(existingResource.getChildResources()); - } - return existingResource; } private void updatePreviouslyInventoriedResource(Resource updatedResource, Resource existingResource) throws InvalidInventoryReportException { + + discoveryBoss.updateExistingResourceInNewTransaction(updatedResource, existingResource); + + for (Resource childResource : updatedResource.getChildResources()) { + mergeResource(childResource, existingResource, existingResource.getAgent()); + } + + return; + } + + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void updateExistingResourceInNewTransaction(Resource updatedResource, Resource existingResource) + throws InvalidInventoryReportException { /* * there exists a small window of time after the synchronous part of the uninventory and before the async * quartz job comes along to perform the actual removal of the resource from the database, that an inventory @@ -833,6 +909,9 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot return; } + // get an attached entity to update + existingResource = entityManager.find(Resource.class, existingResource.getId()); + Resource existingParent = existingResource.getParentResource(); Resource updatedParent = updatedResource.getParentResource(); ResourceType existingResourceParentType = (existingParent != null) ? existingResource.getParentResource() @@ -854,33 +933,35 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot existingResource.getParentResource().removeChildResource(existingResource); } if (updatedParent != Resource.ROOT) { - updatedParent = getExistingResource(updatedParent); + // get attached entity for parent so we can add the child + updatedParent = entityManager.find(Resource.class, updatedParent.getId()); updatedParent.addChildResource(existingResource); } else { existingResource.setParentResource(Resource.ROOT); } - // now that the parent has been established, update the lineage. Note that this method will - // recurse on the children, so update only this resource and let the children be handled by - // the recursion. - // TODO: this can be removed, I think, as the ancestry should be handled under the covers. - //existingResource.setLineageForResource(); + } else { - log.debug("Existing Resource " + existingResource + " has invalid parent type (" - + existingResourceParentType + ") and so does plugin-reported Resource " + updatedResource + " (" - + updatedResourceParentType + ") - valid parent types are [" + validParentTypes + "]."); + if (log.isDebugEnabled()) { + log.debug("Existing Resource " + existingResource + " has invalid parent type (" + + existingResourceParentType + ") and so does plugin-reported Resource " + updatedResource + + " (" + updatedResourceParentType + ") - valid parent types are [" + validParentTypes + "]."); + } } } // The below block is for Resources that were created via the RHQ GUI, whose descriptions will be null. if (existingResource.getDescription() == null && updatedResource.getDescription() != null) { - log.debug("Setting description of existing resource with id " + existingResource.getId() + " to '" - + updatedResource.getDescription() + "' (as reported by agent)..."); + if (log.isDebugEnabled()) { + log.debug("Setting description of existing resource with id " + existingResource.getId() + " to '" + + updatedResource.getDescription() + "' (as reported by agent)..."); + } existingResource.setDescription(updatedResource.getDescription()); } // Log a warning if the agent says the Resource key has changed (should rarely happen). if ((existingResource.getResourceKey() != null) && !existingResource.getResourceKey().equals(updatedResource.getResourceKey())) { + log.warn("Agent reported that key for " + existingResource + " has changed from '" + existingResource.getResourceKey() + "' to '" + updatedResource.getResourceKey() + "'."); } @@ -894,24 +975,48 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot existingResource.setAgentSynchronizationNeeded(); } - for (Resource childResource : updatedResource.getChildResources()) { - // It's important to specify the existing Resource, which is an attached entity bean, as the parent. - mergeResource(childResource, existingResource, existingResource.getAgent()); - } return; } private boolean initResourceTypes(Resource resource) { - ResourceType resourceType; - try { - resourceType = this.resourceTypeManager.getResourceTypeByNameAndPlugin(subjectManager.getOverlord(), - resource.getResourceType().getName(), resource.getResourceType().getPlugin()); - } catch (RuntimeException e) { - log.error("Failed to lookup Resource type [" + resource.getResourceType() + "] for reported Resource [" - + resource + "] - this should not have happened."); - return false; + return initResourceTypes(resource, new HashMap<String, ResourceType>()); + } + + /** + * recursively assign (detached) ResourceType entities to the resource tree + * @param resource + * @param loadedTypeMap Empty map to start, filled as we go to minimize DB fetches + * @return + */ + private boolean initResourceTypes(Resource resource, Map<String, ResourceType> loadedTypeMap) { + + String plugin = resource.getResourceType().getPlugin(); + String name = resource.getResourceType().getName(); + StringBuilder key = new StringBuilder(plugin); + key.append(":::"); + key.append(name); + ResourceType resourceType = loadedTypeMap.get(key.toString()); + + if (null == resourceType) { + try { + ResourceTypeCriteria c = new ResourceTypeCriteria(); + c.addFilterPluginName(plugin); + c.addFilterName(name); + List<ResourceType> result = resourceTypeManager.findResourceTypesByCriteria( + subjectManager.getOverlord(), c); + + if (!result.isEmpty()) { + resourceType = result.get(0); + loadedTypeMap.put(key.toString(), resourceType); + } + } catch (RuntimeException e) { + log.error("Failed to lookup Resource type [" + resource.getResourceType() + "] for reported Resource [" + + resource + "] - this should not have happened."); + return false; + } } - if (resourceType == null) { + + if (null == resourceType) { log.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType() + "]. The Agent most likely has a plugin named '" + resource.getResourceType().getPlugin() + "' installed that is not installed on the Server. Resource will be ignored..."); @@ -919,57 +1024,80 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot } resource.setResourceType(resourceType); + for (Iterator<Resource> childIterator = resource.getChildResources().iterator(); childIterator.hasNext();) { Resource child = childIterator.next(); - if (!initResourceTypes(child)) { + if (!initResourceTypes(child, loadedTypeMap)) { childIterator.remove(); } } + return true; } + /** + * <p>Not In Transaction</p> + * + * Add the resource to the existing parent and recursively do the same for all children. Each resource + * will be persisted in a separate transaction to ensure one overly long transaction does nottake place for + * a large resource tree. + * + * @param Pojo, resource + * @param Detached entity, parentResource + */ private void addResourceToInventory(Resource resource, Resource parentResource) { - log.debug("New resource [" + resource + "] reported - adding to inventory with status 'NEW'..."); + if (log.isDebugEnabled()) { + log.debug("New resource [" + resource + "] reported - adding to inventory with status 'NEW'..."); + } + initAutoDiscoveredResource(resource, parentResource); - entityManager.persist(resource); - if (parentResource != null) { - parentResource.addChildResource(resource); + persistResourceToInventory(resource, parentResource); + } + + private void persistResourceToInventory(Resource resource, Resource parentResource) { + + discoveryBoss.persistResourceInNewTransaction(resource, parentResource); + + for (Resource child : resource.getChildResources()) { + persistResourceToInventory(child, resource); } + } - // Add a product version entry for the new resource. - addProductVersionsRecursively(resource); + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public void persistResourceInNewTransaction(Resource resource, Resource parentResource) { - if (parentResource != null) { - groupManager.updateImplicitGroupMembership(subjectManager.getOverlord(), resource); + if (null != parentResource) { + parentResource = entityManager.find(Resource.class, parentResource.getId()); + parentResource.addChildResource(resource); } - // do NOT delete this flush/clear - it greatly improves performance - entityManager.flush(); - entityManager.clear(); - } + entityManager.persist(resource); - /** - * Ensures the resource has the proper relationship to its product version. This method will recursively dig - * into child resources, updating their versions as well. - * - * @param resource resource (along with its children) to which to add product version references - */ - private void addProductVersionsRecursively(Resource resource) { + // Add a product version entry for the new resource. if ((resource.getVersion() != null) && (resource.getVersion().length() > 0)) { ResourceType type = resource.getResourceType(); ProductVersion productVersion = productVersionManager.addProductVersion(type, resource.getVersion()); resource.setProductVersion(productVersion); } - for (Resource child : resource.getChildResources()) { - addProductVersionsRecursively(child); + // Extend implicit (recursive) group membership of the parent to the new child + if (null != parentResource) { + groupManager.updateImplicitGroupMembership(subjectManager.getOverlord(), resource); } } + /** + * <p>Not In Transaction</p> + * + * Before adding a new auto-discovered resource to inventory, ensure that it, and all its descendants, has + * the proper inventory status and an owner and modifier of superUser. + * + * @param resource Pojo + * @param parent Pojo + */ private void initAutoDiscoveredResource(Resource resource, Resource parent) { - // Before adding a new auto-discovered resource to inventory, ensure that it, and all its descendants, has - // the proper inventory status and an owner and modifier of superUser. if ((resource.getParentResource() != null) && (resource.getParentResource().getInventoryStatus() == InventoryStatus.COMMITTED) && ((resource.getResourceType().getCategory() == ResourceCategory.SERVICE) || (resource.getParentResource() @@ -1082,14 +1210,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot ResourceCriteria resourceCriteria = new ResourceCriteria(); resourceCriteria.addFilterParentResourceId(parentResource.getId()); resourceCriteria.addFilterResourceTypeId(resourceType.getId()); - PageList<Resource> childResourcesOfType = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), - resourceCriteria); + PageList<Resource> childResourcesOfType = resourceManager.findResourcesByCriteria( + subjectManager.getOverlord(), resourceCriteria); if (childResourcesOfType.size() >= 1) { throw new RuntimeException("Cannot manually add " + resourceType + " child Resource under parent " - + parentResource + ", since " + resourceType - + " is a singleton type, and there is already a child Resource of that type. " - + "If the existing child Resource corresponds to a managed Resource which no longer exists, " - + "uninventory it and then try again."); + + parentResource + ", since " + resourceType + + " is a singleton type, and there is already a child Resource of that type. " + + "If the existing child Resource corresponds to a managed Resource which no longer exists, " + + "uninventory it and then try again."); } } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java index d80e9e2..65e995f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java @@ -59,12 +59,37 @@ public interface DiscoveryBossLocal extends DiscoveryBossRemote { * * @throws InvalidInventoryReportException if the inventory report is invalid */ - ResourceSyncInfo mergeInventoryReport(InventoryReport report) + ResourceSyncInfo mergeInventoryReport(InventoryReport report) throws InvalidInventoryReportException; + + /** + * <p>Exists for transactional boundary reasons only.</p> + * + * @param updatedResource + * @param existingResource + * @throws InvalidInventoryReportException + */ + void updateExistingResourceInNewTransaction(Resource updatedResource, Resource existingResource) throws InvalidInventoryReportException; /** + * <p>Exists for transactional boundary reasons only.</p> + * + * Persist the resource and optionally create a child relationship with the existing parent. + * + * @param Pojo, resource + * @param Detached entity, parentResource + */ + void persistResourceInNewTransaction(Resource resource, Resource parentResource); + + /** + * @param resourceId + * @return null if not found + */ + ResourceSyncInfo getResourceSyncInfo(int resourceId); + + /** * Returns a map of platforms (the keys) and their servers (the values) that are in the auto-discovery queue but not - * yet imported into inventory. Note that only servers whose direct parent is the plaform will appear in the + * yet imported into inventory. Note that only servers whose direct parent is the platform will appear in the * returned data. Embedded servers (i.e. servers that are children of other servers) will be automatically imported * when you import their parent server. *

1 0

[rhq] Branch 'release/jon3.1.x' - modules/core
by Larry O'Leary 28 Jan '13

28 Jan '13

modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 30 +++++++++- 1 file changed, 27 insertions(+), 3 deletions(-) New commits: commit 26501218b106736b8b3d0f1fd1285177a08f9ea3 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Dec 19 12:39:24 2012 -0500 [BZ 887411] don't uninventory everything just because we commited some top level server (cherry picked from commit d5564f3562ee960115cc533f029521000c870f45) diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index d95a976..7857bb7 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -1087,7 +1087,24 @@ public class InventoryManager extends AgentService implements ContainerService, return true; } + /** + * Performs a sync so that resources passed in are reflected in the agent's inventory. + * This assumes the resource sync infos passed in represent the full inventory tree. + * + * @param syncInfo information on all resources in the entire inventory tree + */ private void synchInventory(ResourceSyncInfo syncInfo) { + synchInventory(syncInfo, false); + } + + /** + * Performs a sync so that resources passed in are reflected in the agent's inventory. + * + * @param syncInfo the resources' sync data + * @param partialInventory if true, syncInfo represents only a partial inventory. + * if false, syncInfo represents the full inventory tree of all resources + */ + private void synchInventory(ResourceSyncInfo syncInfo, boolean partialInventory) { log.info("Syncing local inventory with Server inventory..."); long startTime = System.currentTimeMillis(); Set<Resource> syncedResources = new LinkedHashSet<Resource>(); @@ -1099,7 +1116,12 @@ public class InventoryManager extends AgentService implements ContainerService, // rhq-980 Adding agent-side logging to report any unexpected synch failure. try { - getAllUuids(syncInfo, allServerSideUuids); + // don't bother doing this if we are processing a partial inventory. + // allServerSideUuids is only ever used to purge obsolete resources, but we don't + // do that for partial inventories, so we don't need to prepare that collection for partials. + if (!partialInventory) { + getAllUuids(syncInfo, allServerSideUuids); + } log.debug("Processing Server sync info..."); processSyncInfo(syncInfo, syncedResources, unknownResourceIds, modifiedResourceIds, deletedResourceIds, @@ -1113,7 +1135,9 @@ public class InventoryManager extends AgentService implements ContainerService, mergeUnknownResources(unknownResourceIds); mergeModifiedResources(modifiedResourceIds); - purgeObsoleteResources(allServerSideUuids); + if (!partialInventory) { + purgeObsoleteResources(allServerSideUuids); + } postProcessNewlyCommittedResources(newlyCommittedResources); if (log.isDebugEnabled()) { if (!deletedResourceIds.isEmpty()) { @@ -2164,7 +2188,7 @@ public class InventoryManager extends AgentService implements ContainerService, + "] and its descendants..."); // Get the latest resource data rooted at the given id. - synchInventory(syncInfo); + synchInventory(syncInfo, true); // this method assumes we only get a single resource and its children (BZ 887411) performServiceScan(syncInfo.getId()); // NOTE: This will block (the initial scan blocks). }

1 0

[rhq] Branch 'release/jon3.1.x' - modules/plugins
by Larry O'Leary 28 Jan '13

28 Jan '13

modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 24 ++++++---- 1 file changed, 16 insertions(+), 8 deletions(-) New commits: commit d424355d2d79746a63cf326629777e004378b0ed Author: Larry O'Leary <loleary(a)redhat.com> Date: Tue Jan 8 16:59:11 2013 -0600 Bug 905183 - [as5 plugin] Unable to collect metric from web application context due to WebApplicationContextComponent not initializing 'clustered' property value Added code to verify that clustered has been initialized and if it has not, an attempt is made to initialize it. Additionally, it will not be used if it is not initialized. (cherry picked from commit 4403c93e9f56274644f397174582a0540c0195fc) diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java index 07708b7..dd63305 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java @@ -142,16 +142,24 @@ public class WebApplicationContextComponent extends ManagedComponentComponent { report.addData(trait); } } else { - String metricNameToUse = metricName; - if (clustered && !"runState".equals(metricName)) { - metricNameToUse = toUpperCaseFirstLetter(metricName); + String value = null; + + /* + * Bug 737996 - Working around the property names inconsistency in the clustered web app contexts. + * If clustered we need to capitalize the first letter of the metric name to workaround JBPAPP-7172. + * If null is returned then we can assume that JBPAPP-7172 does not apply here and use the expected + * metric name. + */ + if (clustered == null) { + retrieveClusteredProperty(); } - String value = getMeasurement(component, metricNameToUse); + if (clustered != null && clustered && !"runState".equals(metricName)) { + value = getMeasurement(component, toUpperCaseFirstLetter(metricName)); + } - if (clustered && !"runState".equals(metricName) && value == null) { - //hmm... so it looks like https://issues.jboss.org/browse/JBPAPP-7172 has been fixed - //and we're getting the metric names in lower case even for clustered contexts + // value should be null unless app is clustered and JBPAPP-7172 applies + if (value == null) { value = getMeasurement(component, metricName); } @@ -265,4 +273,4 @@ public class WebApplicationContextComponent extends ManagedComponentComponent { return Character.toUpperCase(first) + name.substring(1); } -} \ No newline at end of file +}

1 0

[rhq] Branch 'bug/893217' - 0 commits -
by Larry O'Leary 28 Jan '13

28 Jan '13

Rebased ref, commits from common ancestor:

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits January 2013