modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 4 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 28 +++++++--- modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml | 13 ++-- 3 files changed, 31 insertions(+), 14 deletions(-)
New commits: commit d6c82407c5f3571145febcfc1e6cebd669a289bb Author: Heiko W. Rupp hwr@redhat.com Date: Tue Jul 6 17:08:11 2010 +0200
Fix typos
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 74404a9..34a4e71 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 @@ -309,10 +309,10 @@ <!-- used to perftest measurement collection --> <server name="server-d" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Server D"> <service name="service-d-metrics" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Nested Service D With Metrics"> - <metric property="metric000" defaultOn="true" displayType="summary"defaultInterval="540000"/> - <metric property="metric001" defaultOn="true" displayType="summary"defaultInterval="600000"/> - <metric property="metric002" defaultOn="true" displayType="summary"defaultInterval="720000"/> - <metric property="metric003" defaultOn="true" displayType="summary"defaultInterval="600000"/> + <metric property="metric000" defaultOn="true" displayType="summary" defaultInterval="540000"/> + <metric property="metric001" defaultOn="true" displayType="summary" defaultInterval="600000"/> + <metric property="metric002" defaultOn="true" displayType="summary" defaultInterval="720000"/> + <metric property="metric003" defaultOn="true" displayType="summary" defaultInterval="600000"/> <metric property="metric004" defaultOn="true" displayType="summary" defaultInterval="600000"/> <metric displayName="CallTime" property="calltime" defaultOn="true" dataType="calltime" defaultInterval="1200000" units="milliseconds"/> <event name="PerfTestEventType" description="a test event type"/>
commit 5c7d99dc0c844bcb77dec9ab24ef086e3748cdd3 Author: Heiko W. Rupp hwr@redhat.com Date: Tue Jul 6 17:07:28 2010 +0200
Deliver less call time data, enable events. Put some variance in schedules for metrics to not have all always fire at the same time.
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 880c3c3..74404a9 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 @@ -309,12 +309,13 @@ <!-- used to perftest measurement collection --> <server name="server-d" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Test Server D"> <service name="service-d-metrics" class="PerfTestComponent" discovery="PerfTestDiscoveryComponent" description="Nested Service D With Metrics"> - <metric property="metric000" defaultOn="true" displayType="summary"/> - <metric property="metric001" defaultOn="true" displayType="summary"/> - <metric property="metric002" defaultOn="true" displayType="summary"/> - <metric property="metric003" defaultOn="true" displayType="summary"/> - <metric property="metric004" defaultOn="true" displayType="summary"/> - <metric displayName="CallTime" property="calltime" defaultOn="true" dataType="calltime" defaultInterval="60000" units="milliseconds"/> + <metric property="metric000" defaultOn="true" displayType="summary"defaultInterval="540000"/> + <metric property="metric001" defaultOn="true" displayType="summary"defaultInterval="600000"/> + <metric property="metric002" defaultOn="true" displayType="summary"defaultInterval="720000"/> + <metric property="metric003" defaultOn="true" displayType="summary"defaultInterval="600000"/> + <metric property="metric004" defaultOn="true" displayType="summary" defaultInterval="600000"/> + <metric displayName="CallTime" property="calltime" defaultOn="true" dataType="calltime" defaultInterval="1200000" units="milliseconds"/> + <event name="PerfTestEventType" description="a test event type"/> </service> </server>
commit d91539eebdae138120ffe907101ddf90907797fb Author: Heiko W. Rupp hwr@redhat.com Date: Tue Jul 6 15:55:05 2010 +0200
BZ610179
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 7fe7a5e..df9b758 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -276,9 +276,22 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage toBeDeletedQuery.setParameter("resourceId", resourceId); List<Integer> toBeDeletedResourceIds = toBeDeletedQuery.getResultList();
- boolean hasErrors = uninventoryResourcesBulkDelete(overlord, toBeDeletedResourceIds); - if (hasErrors) { - throw new IllegalArgumentException("Could not remove resources from their containing groups"); + int i = 0; + log.debug("== total size : " + toBeDeletedResourceIds.size()); + + while (i<toBeDeletedResourceIds.size()) { + int j = i + 1000; + if (j > toBeDeletedResourceIds.size()) + j = toBeDeletedResourceIds.size(); + List<Integer> idsToDelete = toBeDeletedResourceIds.subList(i,j); + log.debug("== Bounds " + i + ", " + j); + + + boolean hasErrors = uninventoryResourcesBulkDelete(overlord, idsToDelete); + if (hasErrors) { + throw new IllegalArgumentException("Could not remove resources from their containing groups"); + } + i = j; }
Query markDeletedQuery = entityManager.createNamedQuery(Resource.QUERY_MARK_RESOURCES_FOR_ASYNC_DELETION); @@ -379,12 +392,12 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage DeleteResourceHistory.QUERY_DELETE_BY_RESOURCES, // CreateResourceHistory.QUERY_DELETE_BY_RESOURCES, // ResourceConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_0, // orphan parent list or maps (execute only on non selfRefCascade dbs) - ResourceConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_1, // first, delete the raw configs for the config + ResourceConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_1, // first, delete the raw configs for the config ResourceConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_2, // then delete the config objects ResourceConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_3, // then the history objects wrapping those configs PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_0, // orphan parent list or maps (execute only on non selfRefCascade dbs) PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_1, // first, delete the raw configs for the config - PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_2, // then delete the config objects + PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_2, // then delete the config objects PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_3, // then the history objects wrapping those configs AlertConditionLog.QUERY_DELETE_BY_RESOURCES, // Don't AlertNotificationLog.QUERY_DELETE_BY_RESOURCES, // alter @@ -400,18 +413,21 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage boolean supportsCascade = DatabaseTypeFactory.getDefaultDatabaseType().supportsSelfReferringCascade();
boolean hasErrors = false; + boolean debugEnabled = log.isDebugEnabled(); for (String namedQueryToExecute : namedQueriesToExecute) { // execute all in new transactions, continuing on error, but recording whether errors occurred
// If the db vendor can not support our self-referring cascade delete data model then we may have // to leave some config prop rows orphaned. Only execute the selected queries if you *do* - // want to avoid self-referring cascade delete (and leave orphans) + // want to avoid self-referring cascade delete (and leave orphans) if (supportsCascade && ( // namedQueryToExecute.equals(ResourceConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_0) || // namedQueryToExecute.equals(PluginConfigurationUpdate.QUERY_DELETE_BY_RESOURCES_0))) { continue; }
+ if (debugEnabled) + log.debug("uninv, running query: " + namedQueryToExecute); hasErrors |= resourceManager.bulkNamedQueryDeleteInNewTransaction(overlord, namedQueryToExecute, resourceIds); }
commit a01f5013b4e816807ae846c452ca8292791eaae9 Author: Heiko W. Rupp hwr@redhat.com Date: Tue Jul 6 15:54:51 2010 +0200
BZ 611432 - Re-enable sorting on columns
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml index ea8017a..5fd39e5 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml @@ -132,7 +132,7 @@
rich:column <f:facet name="header"> - <onc:sortableColumnHeader sort="r.name"> + <onc:sortableColumnHeader sort="name"> <h:outputText styleClass="headerText" value="Resource" /> </onc:sortableColumnHeader> </f:facet> @@ -161,7 +161,7 @@
rich:column <f:facet name="header"> - <onc:sortableColumnHeader sort="r.description"> + <onc:sortableColumnHeader sort="description"> <h:outputText styleClass="headerText" value="Description" /> </onc:sortableColumnHeader> </f:facet>
rhq-commits@lists.fedorahosted.org