May 2014 - rhq-commits - Fedora Mailing-Lists

[rhq-project/rhq] 2ef9ad: [BZ 1021018] Use the plugin configuration timeout ...

by Stefan Negrea

Branch: refs/heads/release/jon3.2.x Home: https://github.com/rhq-project/rhq Commit: 2ef9ad2dd2af728af3817baf946089b512609bc3 https://github.com/rhq-project/rhq/commit/2ef9ad2dd2af728af3817baf946089b... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-22 (Thu, 22 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/PluginContainerProperties.java Log Message: ----------- [BZ 1021018] Use the plugin configuration timeout for async availability checks. And for all the sync availability checks use the plugin container avail timeout. This mirrors the functionality implemented for the apache plugin for sync timeouts. And also takes full advantage of the async configuration already implemented in the plugin. (cherry picked from commit 7864c9004f1f26d4296ee97dffb8b7cdcc3ecddc)

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] 5cbf42: [BZ 1100278] system setting cannot be null

by John Sanda

Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: 5cbf4208dceb03514d10a7efeb201392fbade535 https://github.com/rhq-project/rhq/commit/5cbf4208dceb03514d10a7efeb20139... Author: John Sanda <jsanda(a)redhat.com> Date: 2014-05-22 (Thu, 22 May 2014) Changed paths: M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManager.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java Log Message: ----------- [BZ 1100278] system setting cannot be null

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] 17bb05: [BZ 1070323] Initial prototype of a JDR plugin, th...

by John Mazzitelli

Branch: refs/heads/feature/bz1069606-rebase-eap-63 Home: https://github.com/rhq-project/rhq Commit: 17bb05f8d98d0b6ce22be2515f5d86f3c96bb4ec https://github.com/rhq-project/rhq/commit/17bb05f8d98d0b6ce22be2515f5d86f... Author: Heiko W. Rupp <hwr(a)redhat.com> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M modules/enterprise/pom.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerLocal.java A modules/enterprise/server/server-jdr/README.adoc A modules/enterprise/server/server-jdr/pom.xml A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQCommand.java A modules/enterprise/server/server-jdr/src/main/java/org/rhq/server/jdr/RHQPlugin.java M pom.xml Log Message: ----------- [BZ 1070323] Initial prototype of a JDR plugin, that talks to the server via http to the existing REST-endpoint. This endpoint got enhanced to also show information about agents and storage nodes. Commit: c6c26f527bce3ec74bf35abe4bf5ddcc55e7fddc https://github.com/rhq-project/rhq/commit/c6c26f527bce3ec74bf35abe4bf5ddc... Author: Heiko W. Rupp <hwr(a)redhat.com> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M modules/enterprise/server/server-jdr/README.adoc R modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQCommand.java A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQFilesCollector.java A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQGetStatusCommand.java M modules/enterprise/server/server-jdr/src/main/java/org/rhq/server/jdr/RHQPlugin.java Log Message: ----------- Add a files collector to retrieve RHQ-specific files. Commit: 7439745074816bcfa93e583066f4bcaba78e076c https://github.com/rhq-project/rhq/commit/7439745074816bcfa93e583066f4bca... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml Log Message: ----------- inject RHQ JDR jar in to AS JDR module when asseblying Commit: c9006f2ce4c3571e0511cd54614fa8e88df71431 https://github.com/rhq-project/rhq/commit/c9006f2ce4c3571e0511cd54614fa8e... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/ear/pom.xml A modules/enterprise/server/plugins/jdr-support/pom.xml A modules/enterprise/server/plugins/jdr-support/src/main/java/org/rhq/enterprise/server/plugins/jdr/JdrServerPluginComponent.java A modules/enterprise/server/plugins/jdr-support/src/main/resources/META-INF/rhq-serverplugin.xml M modules/enterprise/server/plugins/pom.xml M modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml Log Message: ----------- Added JDR Support server plugin This plugin allows to JDR to get system information from RHQ server. It sets up socket server. Client has to provide authorization token in order to recieve data. This token is written in ${jboss.server.data.dir}/jdr-token file. Commit: f1244f32740577d040dd5495506c3eeea4cb0c77 https://github.com/rhq-project/rhq/commit/f1244f32740577d040dd5495506c3ee... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M modules/enterprise/server/server-jdr/pom.xml A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQCollectFiles.java R modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQFilesCollector.java R modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQGetStatusCommand.java A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQStatusCommand.java M modules/enterprise/server/server-jdr/src/main/java/org/rhq/server/jdr/RHQPlugin.java Log Message: ----------- rewrote JDR plugin to get system info via JDR Support server plugin Commit: 41c46158436758a2c9a630f721e838b582e1a8cc https://github.com/rhq-project/rhq/commit/41c46158436758a2c9a630f721e838b... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M modules/enterprise/server/plugins/jdr-support/src/main/java/org/rhq/enterprise/server/plugins/jdr/JdrServerPluginComponent.java M modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQStatusCommand.java Log Message: ----------- [BZ 1070323] (JON3-41) JBoss ON must support JBoss Diagnostic Reporter (JDR) Do not use InetAddress java 1.7 API, improved JDR Support server plugin security. Commit: ea90cf57437abcdef85edf9ca5990e61cb862220 https://github.com/rhq-project/rhq/commit/ea90cf57437abcdef85edf9ca5990e6... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M modules/enterprise/server/plugins/jdr-support/pom.xml M modules/enterprise/server/server-jdr/pom.xml Log Message: ----------- bump versions to 4.12 Commit: 89d4f63a8017d4ee4acd20b3af3129f71086c980 https://github.com/rhq-project/rhq/commit/89d4f63a8017d4ee4acd20b3af3129f... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: 2014-05-13 (Tue, 13 May 2014) Changed paths: M modules/core/domain/intentional-api-changes-since-4.11.0.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ProblemResourceComposite.java Log Message: ----------- [BZ 1032033] - Sort unavailable & alerted resources portlet - parent first Fix a few issues with the prior commit for this issue (e429846dd715e0) - needed to be able to handle null ancestry (for platforms, which can be problem resources like anything else). This fix fixed the test failures as well. - Restore the previous ProblemResourceComposite constructor since this class *is* exposed remotely. Add new entry for new constructor. Commit: 96bc0ba630e2d5a111e45d7e33c27169bab3b9f6 https://github.com/rhq-project/rhq/commit/96bc0ba630e2d5a111e45d7e33c2716... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-13 (Tue, 13 May 2014) Changed paths: A modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java Log Message: ----------- [BZ 1080552] Adjust the code for the API changes and add exceptions where necessary. The old method is now deprecated but fully implements a call to the revised version. Commit: 6fccc153c51023a4d5312d3777a2fc85c0198064 https://github.com/rhq-project/rhq/commit/6fccc153c51023a4d5312d3777a2fc8... Author: John Mazzitelli <mazz(a)redhat.com> Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java Log Message: ----------- BZ 1096927 - might not be related to this BZ, but the problem is if you re-run the installer after it failed the first time, it seems it refuses to reuse the jboss.bind.address if jboss.bind.address.management is blank (that is, not commented out, but empty). Commit: 61c34e5ac5320ec6bcdb105f8641424e638e1309 https://github.com/rhq-project/rhq/commit/61c34e5ac5320ec6bcdb105f8641424... Author: Jirka Kremser <jkremser(a)redhat.com> Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/DashboardView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/summary/ActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/summary/ActivityView.java Log Message: ----------- Fixing the ugly "{Resource|Group}: Events" portlet layout (height was too low). Also fixing a typo in DashboardView class. Commit: 2402f436977bed77c169c867be9e0303ec55ed7f https://github.com/rhq-project/rhq/commit/2402f436977bed77c169c867be9e030... Author: Thomas Segismont <tsegismo(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/plugins/database/src/main/java/org/rhq/plugins/database/DatabasePluginUtil.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java M modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- Bug 1083148 - Postgres Plugin - Compatibility Group With Postgres Users Errors On Configuration Change Changed resource key format and implemented resource upgrade facet Fixed resource deletion Fixed user rename Implemented update of "can update system catalog" resource config property Updated plugin descriptor (added comments on superuser) Commit: 5a3382f71e34e8732ca61f7e53eff40a7347f351 https://github.com/rhq-project/rhq/commit/5a3382f71e34e8732ca61f7e53eff40... Author: Jirka Kremser <jkremser(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml Log Message: ----------- [BZ 1097106] - Login page is shown for a while even when you are already logged in - Redirecting from / to /coregui not to /coregui/login, because if user is logged in she sees the "blue-screen-of-login™" Commit: 9874b8e4816dee35833b90dc3f0a8218ee44557b https://github.com/rhq-project/rhq/commit/9874b8e4816dee35833b90dc3f0a821... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- [BZ 1069545] Add Subsystems and Server Configuration subcategories. Commit: 5be9d35a859366f0da72329610d20b78d9e2bffb https://github.com/rhq-project/rhq/commit/5be9d35a859366f0da72329610d20b7... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java Log Message: ----------- [BZ 1069545] Add a ManyToMany relationship between resource type and proper subcategories. Also, add new table, upgrade schema, and upgrade tasks to move to the new model. Commit: 1535aaf8bf5094893573a4f1aa3e92c2c66c52c7 https://github.com/rhq-project/rhq/commit/1535aaf8bf5094893573a4f1aa3e92c... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java Log Message: ----------- [BZ 1069545] Clean the subcategory class as well the persisting layers. Commit: 25d37b1e1197bc3c4503a2138d13f3a443768f48 https://github.com/rhq-project/rhq/commit/25d37b1e1197bc3c4503a2138d13f3a... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java Log Message: ----------- [BZ 1069545] Add code that indepdently persists the subcategories. Commit: 302326a1c2e8890f9e367e200d00b54a482e28f5 https://github.com/rhq-project/rhq/commit/302326a1c2e8890f9e367e200d00b54... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/SubCategoriesMetadataParserTest.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDescriptorProcessor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java Log Message: ----------- [BZ 1069545] First cut at removing the predefined subcategories concept. This version has some functionality removed but will be added in later revisions. Commit: 7e32c7fdd5d02fa5c0d30618c590ee01a52d385f https://github.com/rhq-project/rhq/commit/7e32c7fdd5d02fa5c0d30618c590ee0... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M etc/eclipse-tools/hibernate.cfg.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java Log Message: ----------- [BZ 1069545] Gui changes for the subcategory generation. The subcategories are now driven by attributes on the child resource type. Commit: 62021ed04882b2d0da8d4e2dd562d3ddd99fc1b2 https://github.com/rhq-project/rhq/commit/62021ed04882b2d0da8d4e2dd562d3d... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java Log Message: ----------- [BZ 1069545] Fix queries related to subcategories. Commit: 386e726eceb5c346c6e75c17fa0619b71b5f2c0c https://github.com/rhq-project/rhq/commit/386e726eceb5c346c6e75c17fa0619b... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java Log Message: ----------- [BZ 1069545] More subcategory cleanup, removing unused code and fixing joined queries. Commit: fe5bb64ca90c10c29658646f398a4f4479599617 https://github.com/rhq-project/rhq/commit/fe5bb64ca90c10c29658646f398a4f4... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java Log Message: ----------- [BZ 1069545] Removing more undeeded code for fetching subcategories. Subcategories are now just a proper field on the resource type. Commit: 7915a1c0d1f94206cd4a0fd41fd1ea2b5cb59342 https://github.com/rhq-project/rhq/commit/7915a1c0d1f94206cd4a0fd41fd1ea2... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- [BZ 1069545] Updates to the tree build structure. Commit: f20731b47a3c3a30903a0f08c73b8a4fa7860167 https://github.com/rhq-project/rhq/commit/f20731b47a3c3a30903a0f08c73b8a4... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java Log Message: ----------- [BZ 1069545] More updates to the tree build structure. Commit: 39bb847b8118bc46ceeeac43cfb4d8db0f6fef41 https://github.com/rhq-project/rhq/commit/39bb847b8118bc46ceeeac43cfb4d8d... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java Log Message: ----------- [BZ 1069545] More updates to the tree build structure for the resource view. Commit: 6863de9642a0c4470cd871d4f2cb807fd245cce5 https://github.com/rhq-project/rhq/commit/6863de9642a0c4470cd871d4f2cb807... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- [BZ 1069545] The resource tree view now renders subcategories as well as nested subcategories with the identical names properly. Commit: 3b2550b2b8fab19a96e14a42ad9404de8a8a324b https://github.com/rhq-project/rhq/commit/3b2550b2b8fab19a96e14a42ad9404d... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java Log Message: ----------- [BZ 1069545] First round for addressing API differences due to this change. Commit: 198f9331180ca6c9757216c55a1fde62a223d05c https://github.com/rhq-project/rhq/commit/198f9331180ca6c9757216c55a1fde6... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml Log Message: ----------- [BZ 1069545] Updates to the API change. Commit: cabbc1165ff95ba3406fc745026c5d3b40370562 https://github.com/rhq-project/rhq/commit/cabbc1165ff95ba3406fc745026c5d3... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java Log Message: ----------- [BZ 1069545] Fix type merging to support updates to subcategories. Commit: 3ee07efc34418b75eeb2432841dd704bfa2d03aa https://github.com/rhq-project/rhq/commit/3ee07efc34418b75eeb2432841dd704... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml Log Message: ----------- [BZ 1069545] Reorder api check exceptions. Commit: 880d1abae7d10d98f33f45aded50ab0604550ce8 https://github.com/rhq-project/rhq/commit/880d1abae7d10d98f33f45aded50ab0... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml Log Message: ----------- [BZ 1069545] Database upgrade task for subcategories. Commit: 3cd47a544572fc3d3ea326f97d6d51a222b1b15d https://github.com/rhq-project/rhq/commit/3cd47a544572fc3d3ea326f97d6d51a... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- [BZ 1069545] Remove subcategories from all the plugins and fix subcategory nesting where needed. Commit: c0431c9fb84f248427bad7395448f970cfb11035 https://github.com/rhq-project/rhq/commit/c0431c9fb84f248427bad7395448f97... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java R modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/old-subcat.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java Log Message: ----------- [BZ 1069545] Update remaining unit and integration tests. The tests are heavily simplified because there is entity to handle subcategories. Subcategories are now just a field on the resource type so there is not much to test anymore. Commit: 7acf5a029ea1aba3dd4155e30c5a5f5e6df0528c https://github.com/rhq-project/rhq/commit/7acf5a029ea1aba3dd4155e30c5a5f5... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy Log Message: ----------- [BZ 1069545] Update serialization version to touched domain objects. Removed unused queries for domain objects. Deprecate more code. Remove inadvertently introduced groovy script. Increase string size for subcategory. Commit: 8e092dbd6847caf6c97d629580d4077ba860094e https://github.com/rhq-project/rhq/commit/8e092dbd6847caf6c97d629580d4077... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java Log Message: ----------- [BZ 1069545] Add deprecation documentation to all the code modified for this feature. Commit: 006f3cfe765ea23ad6f4a76484069f47be7e262d https://github.com/rhq-project/rhq/commit/006f3cfe765ea23ad6f4a76484069f4... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java Log Message: ----------- [1093822] RFE: Allow automatic uninventory of dead / missing / removed resources Changing "DEAD" to "MISSING" in response to terminology feedback. (cherry picked from commit 78df7de3618ac64f5e7595d54fa1ad30121e4f36) Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java Commit: 298a65c5154dc4106ac42e5e3c7d4a2fbbe78549 https://github.com/rhq-project/rhq/commit/298a65c5154dc4106ac42e5e3c7d4a2... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- [BZ 1069545] Align subsystems subcategories with EAP admin console. Commit: 277a70d72de1840c2c10b6d03b7ec0de942c9e24 https://github.com/rhq-project/rhq/commit/277a70d72de1840c2c10b6d03b7ec0d... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml M modules/core/domain/intentional-api-changes-since-4.11.0.xml Log Message: ----------- [BZ 1069545] Fix API changes files since RHQ 4.11 has been released. Commit: 41c24733c5bcc6865e8903a5d8e231bd7be65518 https://github.com/rhq-project/rhq/commit/41c24733c5bcc6865e8903a5d8e231b... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/intentional-api-changes-since-4.11.0.xml Log Message: ----------- [BZ 1069545] Fix API changes files since RHQ 4.11 has been released. Commit: 389e03bfe37b0e6822e050bc8c7a50067aaafebd https://github.com/rhq-project/rhq/commit/389e03bfe37b0e6822e050bc8c7a500... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml Log Message: ----------- [BZ 1069545] Increment database version number. Commit: 6bd9be98054f8a9a67293cc137b6c8e3fc41e10b https://github.com/rhq-project/rhq/commit/6bd9be98054f8a9a67293cc137b6c8e... Author: jshaughn <jshaughn(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M etc/eclipse-tools/hibernate.cfg.xml M etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/SubCategoriesMetadataParserTest.java M modules/core/dbutils/pom.xml A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/intentional-api-changes-since-4.10.0.xml M modules/core/domain/intentional-api-changes-since-4.11.0.xml M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDescriptorProcessor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java R modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/old-subcat.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java M modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- Merge pull request #22 from rhq-project/BZ1069545 Put EAP subsystems into JON subcategories - BZ1069545 Commit: 1e632542712dc9c77e7cd1b69d69efda51efe874 https://github.com/rhq-project/rhq/commit/1e632542712dc9c77e7cd1b69d69efd... Author: John Mazzitelli <mazz(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java A modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/AgentSupportedVersionTest.java Log Message: ----------- BZ 1097921 - first attempt at relaxing agent version check Commit: 942f18c96ba7e2869820b7e0a5d8dcd10d889e54 https://github.com/rhq-project/rhq/commit/942f18c96ba7e2869820b7e0a5d8dcd... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java Log Message: ----------- [1060353] Non required or unused properties in rhq-server.properties are being required by rhqctl Better handle backward compatible oracle settings where the "unused" settings are carried forward via upgrade. Commit: 007e6bdd575abd48681d6c321d6edbc878c29b52 https://github.com/rhq-project/rhq/commit/007e6bdd575abd48681d6c321d6edbc... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java M modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java M modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java M modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentData.java M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java M modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java Log Message: ----------- [1070375] rhq:url-archive, rhq:archive should support destinationFile/destinationDir - Add support for exploded archives. So, the new destinationDir attribute can be used with exploded=true|false. Also, - Fix FileUtilTest.normalizePath() and .stripDriveLetter() to normalize the Windows drive letter by ensuring upcase. Commit: f9ef978b72ae6d484a4143990bbc5db8965cc18d https://github.com/rhq-project/rhq/commit/f9ef978b72ae6d484a4143990bbc5db... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- [BZ 1015334] EAP 6 host controller domain host update results in managed servers no longer being "manageable" This commit deprecates 'domainHost' read-only pluginConfiguration property. Instead new trait called 'Domain Host Name' was introduced. BaseServerComponent#validateServerAttributes() now also checks for HC name and if needed re-reads it from host.xml file. When <host name= changes, deprecated 'domainHost' property does not get updated (since there is no way from plugin avail code to update pluginConfiguration on server). BaseServerComponent now handles 'domainHost' in memory, this variable gets updated on component start or in avail code (when server was DOWN and now is UP). Managed servers have domain host name as part of resource key, they get correctly discovered when this change occurs. Commit: e8ad09ec4c43149a06efd2be803caa43386ee956 https://github.com/rhq-project/rhq/commit/e8ad09ec4c43149a06efd2be803caa4... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ResultFailedException.java Log Message: ----------- [BZ 1015334] EAP 6 host controller domain host update results in managed servers no longer being "manageable" Fixed javadocs, renamed variables. Also made access to ASHostName synchronized since it's value can be changed from avail thread and is being read all over other threads. Big change of this commit is getAvailability(). Now we directly read server's name attribute instead of 'launch-type' (which was probably lets-just-read-something) and in case of failure (making we just failed to read value, but connection and other stuf is OK) we re'read <host name from file and try the request again. This approach is more robust than previous, which was only able to detect the change in case server avail went from DOWN to UP. Now, we can detect the change anytime. Commit: c55ce6d67aab6a95ba80c67086c705d310dc5948 https://github.com/rhq-project/rhq/commit/c55ce6d67aab6a95ba80c67086c705d... Author: John Mazzitelli <mazz(a)redhat.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java A modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/AgentSupportedVersionTest.java Log Message: ----------- Merge pull request #35 from rhq-project/feature/bz1097921-relax-agent-version-check BZ 1097921 - relaxing agent version check for those servers that can support multiple agents. Commit: 9fdb50b216cf8aa1ac2cb8fc3db32fdf88ddd5f6 https://github.com/rhq-project/rhq/commit/9fdb50b216cf8aa1ac2cb8fc3db32fd... Author: Stefan Negrea <snegrea(a)redhat.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M modules/core/domain/intentional-api-changes-since-4.11.0.xml Log Message: ----------- [BZ 1069545] Add one more API change exception. Commit: 494e4288d111769782c96bd00b70565f952970ab https://github.com/rhq-project/rhq/commit/494e4288d111769782c96bd00b70565... Author: Heiko W. Rupp <hwr(a)pilhuhn.de> Date: 2014-05-17 (Sat, 17 May 2014) Changed paths: M modules/enterprise/pom.xml M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/ear/pom.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerLocal.java A modules/enterprise/server/plugins/jdr-support/pom.xml A modules/enterprise/server/plugins/jdr-support/src/main/java/org/rhq/enterprise/server/plugins/jdr/JdrServerPluginComponent.java A modules/enterprise/server/plugins/jdr-support/src/main/resources/META-INF/rhq-serverplugin.xml M modules/enterprise/server/plugins/pom.xml M modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml A modules/enterprise/server/server-jdr/README.adoc A modules/enterprise/server/server-jdr/pom.xml A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQCollectFiles.java A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQStatusCommand.java A modules/enterprise/server/server-jdr/src/main/java/org/rhq/server/jdr/RHQPlugin.java M pom.xml Log Message: ----------- Merge pull request #28 from lzoubek/feature/jdr Bug 1070323 - (JON3-41) JBoss ON must support JBoss Diagnostic Reporter (JDR) Commit: 4c60489996c93083b79d709847bce31c45971357 https://github.com/rhq-project/rhq/commit/4c60489996c93083b79d709847bce31... Author: Jeremie Lagarde <jer(a)printstacktrace.org> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java Log Message: ----------- BZ1098792 : Correct the url icons on the timeline view. Commit: dcc27a2c1f1acbf9fb818c92eb27ce278ef6db99 https://github.com/rhq-project/rhq/commit/dcc27a2c1f1acbf9fb818c92eb27ce2... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/PingRequest.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java Log Message: ----------- [1094540] Agents get permanently backfilled if backend database goes offline for a moment Don't unset the backfill flag in the ping logic, just make sure the agent knows the server thinks its down, and let it resolve the situation by sending a full avail report, which when processed will unset the backfill flag. Commit: 182e9daa32eee3ca549dba8c6bdca71b579c0f2f https://github.com/rhq-project/rhq/commit/182e9daa32eee3ca549dba8c6bdca71... Author: Jirka Kremser <jiri.kremser(a)gmail.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java Log Message: ----------- Merge pull request #36 from jerr/BZ1098792 BZ1098792 : Correct the url icons on the timeline view. (lgtm, jk) Commit: 76f9e174ed62be4742f35a91bd3e9aa02934a81e https://github.com/rhq-project/rhq/commit/76f9e174ed62be4742f35a91bd3e9aa... Author: Lukas Krejci <lkrejci(a)redhat.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml Log Message: ----------- [BZ 1099485] Fix JSF file upload popup for all upload locations Commit: 8d27501568e19f159f35c83d8dcce544ad33c3d3 https://github.com/rhq-project/rhq/commit/8d27501568e19f159f35c83d8dcce54... Author: Lukas Krejci <lkrejci(a)redhat.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/DeleteContentRunner.java Log Message: ----------- [BZ 1099497] Discover resource packages after package removal. Commit: 62553ab62763f1d44833ac39776d8f8079c4a630 https://github.com/rhq-project/rhq/commit/62553ab62763f1d44833ac39776d8f8... Author: Jirka Kremser <jkremser(a)redhat.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java Log Message: ----------- Fixing a typo in default value for JDBC connection string for Postgres DB. Commit: e77a5fb48029d8f3de801a5bc46fc0e5e02fcbbe https://github.com/rhq-project/rhq/commit/e77a5fb48029d8f3de801a5bc46fc0e... Author: Mike Thompson <mithomps(a)redhat.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties Log Message: ----------- [BZ 1070352] (JON3-48) Increase the limit of resources allowed to be used in a metric group chart. Increased from 20 to 50 subgraphs. If it goes higher than 50 then a warning message is displayed that some of graph may not be displayed. Commit: 0d6d1880215404ba54f7992f88cef0b4587646d6 https://github.com/rhq-project/rhq/commit/0d6d1880215404ba54f7992f88cef0b... Author: Mike Thompson <mithomps(a)redhat.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/CoreGUI.gwt.xml R modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.13.js R modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.13.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.48.js A modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.48.min.js Log Message: ----------- Upgrade the d3 libraries from 3.3.13 to 3.3.48. Commit: b1eec7471e703b4af0b17d3d3f842f87069305b0 https://github.com/rhq-project/rhq/commit/b1eec7471e703b4af0b17d3d3f842f8... Author: Mike Thompson <mithomps(a)redhat.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/CoreGUI.gwt.xml R modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.12.0.css M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html R modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.12.0.css R modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.11.0.js A modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.12.0.js Log Message: ----------- Manually rev the css and js lib version numbers to prevent browser caching. Commit: 49b73f38211ba2078d38cd4e579159aba0ab8385 https://github.com/rhq-project/rhq/commit/49b73f38211ba2078d38cd4e579159a... Author: Filip Brychta <fbrychta(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js M modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js Log Message: ----------- [BZ 1090958] Improve waiting for operation results in sample CLI scripts Commit: 618c6c9d483e4b2624306159c30759cf07b85a89 https://github.com/rhq-project/rhq/commit/618c6c9d483e4b2624306159c30759c... Author: Heiko W. Rupp <hwr(a)pilhuhn.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ResultFailedException.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- Merge pull request #23 from lzoubek/bugs/1015334 [BZ 1015334] EAP 6 host controller domain host update results in managed servers no longer being "manageable" Commit: 94008542694eef157289e6f9884669480021b565 https://github.com/rhq-project/rhq/commit/94008542694eef157289e6f98846694... Author: jshaughn <jshaughn(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/PingRequest.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java Log Message: ----------- Merge pull request #38 from rhq-project/jshaughn/1094540 [1094540] Agents get permanently backfilled if backend database goes off... Commit: fabe6f71458edc2cb5baec031b40c260c613fdb6 https://github.com/rhq-project/rhq/commit/fabe6f71458edc2cb5baec031b40c26... Author: John Sanda <jsanda(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/common/cassandra-schema/pom.xml M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/CQLStep.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/DBConnectionFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/PopulateCacheIndex.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaUpdateThreadFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/Step.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFile.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java M modules/common/cassandra-schema/src/main/resources/schema/update/0002.xml A modules/common/cassandra-schema/src/main/resources/schema/update/0003.xml M modules/common/cassandra-schema/src/test/java/org/rhq/cassandra/schema/UpdateFileTest.java M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java M modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementSchedule.java M modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MetricsIndexUpdateAccumulator.java M modules/enterprise/server/installer/pom.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/installer/src/main/resources/module/main/module.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManager.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateCacheMapper.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/CacheMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawCacheMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationState.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationType.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Aggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BaseAggregator.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregationScheduler.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregationState.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchException.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchFailureListener.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheIterator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CombinedMetricsIterator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CombinedMetricsPair.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute1HourData.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute24HourData.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute6HourData.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/IndexAggregatesPair.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/MetricsFuturesPair.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/OneHourDataScheduler.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PastDataAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PersistFunctions.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/RawDataScheduler.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/SixHourDataScheduler.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/TaskTracker.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateNumericMetric.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateNumericMetricMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateType.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntry.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntryMapper.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsIndexEntry.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsIndexEntryMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsTable.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/NumericMetric.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/RawNumericMetric.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/DateTimeServiceTest.java A modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/InMemoryMetricsDB.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsPerfTests.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/WaitForRawInserts.java R modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatedMetricsServer.java M modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java Log Message: ----------- first cut at metrics_cache table which replaces metrics_index table The number of reads performed during aggregation grow linearly in proportion to the number of schedules with data to be aggregated. In the worst case scenario when 1 hr and 6 hr data are aggregated along with raw data, the number of reads is 3 * N where N is the number of schedules. If there are a million schedules with data, then a million reads have to be performed just to aggregate the raw data. The new metrics_cache table allows us to dramatically reduce the number of reads. When raw data for example is stored it is now written to both the raw_data table as well as the metrics_cache table. A single partition, i.e., row, in metrics_cache contains data for some configurable number of schedules. Right now it defaults to 100. Each partition in metrics_cache contains data only for a given time slice, e.g., 18:00 to 19:00. Once aggregation has run for that time slice, the partition is deleted. If we have a million schedules with raw data and 100 schedules are being stored per partition in metrics_cache, then the number of reads drops from 1 million to 10,000. That is a 99% reduction in the number of reads. And this reduction will not come with a sharp increase in memory utilization. Some refactoring and fixing bug in TaskTracker Moving code to process batches into Aggregator2 (which will be renamed). Part of the reason for this refactoring is logging. Info or debug level logging can be turned on for AggregationManager without flooding the log file with a lot of log statements. TaskTracker provides synchronization for schedules tasks. It is used to track when all of the scheduled tasks have completed. CountDownLatch cannot be used anymore because it requires you to specify the number of tasks or events up front. This worked fine with the metrics_index table since we were only querying against a single row, and we would iterate over the result set to get the count. It is not know in advance though how many rows there will be in metrics_cache so a different sychronization mechanism was needed. Lastly I should mention that I am not referring to CQL rows here but rather rows at the actual storage layer, i.e., thrift rows. more clean up, removing classes that are now unused. update logging to output number of schedules aggregated cleaning up and re-enabling some tests This commit also updates the logic for determine when aggregation last ran after a server outage. It is a bit more complicated now since with metrics_cache there can be multiple partitions per time slice; so, we have to iterate over all possible partitiion keys per time slice, and if we fail to find any data, only then do we check the previous time slice. It was eaasier with the metrics_index table because there was only one partition per time slice. re-enabling and updating tests in MetricsServerTest update server code to pass min/max schedule ids to MetricsServer adding some initial support for failure handling This commit gives the capability to log stack traces when exceptions occur while processing a batch of futures. More importantly, this is a step towards providing fail fast behavior. Suppose we provide a configurable threshold for failures, and when that threshold is passed, we abort the aggregation so that it can be retried at some later time. making some changes based on feedback from code review The wait() notify() calls have been replaced with a CountDownLatch to address the scenario in which notify() is invoked before wait(). JavaDoc has also been added to explain usage. remove references to now obsolete metrics_index table There is still a reference in the data migration code. That will be addressed in a separate task. changing naming convention for the bucket column in metrics_cache Previously when inserting a row into metrics_index, the bucket column would have the next wider bucket as its value. For example, if we inserted raw data, then we would update metrics_index with the bucket column having a value of "one_hour_metrics". With the schema changes to start using metrics_cache in place of metrics_index, this approach got confusing. The bucket column now is set to the name of the historical table in which data is being written. adding metrics_cache_index table to schema along with initial query support update metrics_cache_index when inserting raw data updating, refactoring tests do not insert raw data that is too old This initial support caps the age at 24 hours. The plan going forward however is to make that cap configurable. update metrics_cache and metrics_cache_index for 1 hour and 6 hour data This commit also introduces a big refactoring of AggregationTests. Tracking and updating expected values was tedious and error prone; consequently, I introduced InMemoryMetricsDB. re-enabling 24 hour data tests adding initial support for aggregating late/past data There are two main changes in this commit. The first is the initial suppport for aggregating late data. That is, raw data that is stored after its time slice has already passed. The schema for metrics_cache_index is changed slightly as well. We now order by the time column before the start_schedule_id column. And we are always storing the day, i.e., hour zero in the time_slice column. This reduces the number of queries that need to be performed when looking to see if there is past data to aggregate. There is still work to do for handling late data along with a bunch of clean up and refactoring. I am trying to consolidate the logic as much as possible for aggregating past data and for current data so as to avoid a lot of the code duplication that is going on right now. major refactoring to consolidate common aggregation functions After adding initial support for aggregating old/past data, it was evident that there was a lot of duplicate functionality around aggregating past and current data. This commit introduces a new class, BaseAggregator, which contains common functions. Aggregation has been renamed to CacheAggregator since it only works with data out of the metrics_cache table. This is also the initial commit for CacheIterator. The computeAggregates function, in its previous forms, took a list of result sets as input. The computations to be performed for past and current data is the same, but the format of the input differed. Now the input is an Iterable so that the function can be used with both past and current data. updating logic for determining most recent raw data after server outage This commit also remove the logic around the min/max scheudle ids. Previously we needed the min and max schedule ids in order to determine the possible set of rows in metrics_cache. This is no longer necessary though since we track the schedule ids in metrics_cache_index. adding more util methods and javadoc to DateTimeService add support for aggregating cache blocks in PastDataAggregator If aggregation for a cache block (i.e., partition in metrics_cache) fails, neither the partition nor the corresponding row in metrics_cache_index are deleted. When a subsequent aggregation run is performed, PastDataAggregator will retry those failed partitions. It can be assumed that all data for the time slice is present in metrics_cache; therefore, we can pull data from metrics_cache instead of raw_metrics and potentially reduce query and I/O overhead. when the 6 hour time slice has passed for late data, recompute the 6 hour data This commit is best explained with an example. Suppose the current time is 06:12. We receive a measurement report with data having a timestamp of 05:50. Aggregation will run again at 07:00. The 6 hour time slice for the late data is 00:00 to 06:00, and that time slice has already passed. When aggregation runs, we not only compute the 1 hour aggregate for the data inserted at 05:50, we also recompute the 6 hour aggregate so that the late data is included. update cache and cache index only when necessary for late data When aggregating late data whose 6 hour time slice has not yet finished, we should update metrics_cache and metrics_cache_index so that the necessary rows are present when 6 hour data aggregation runs. If the 6 hour time slice has already passed, then there is no need to update metrics_cache and metrics_cache_index because we go ahead and recompute the 6 hour data. The same idea holds with 24 hour data. If the 24 hour time slice has not yet finished, then should update metrics_cache and metrics_cache_index so that the necessary rows are present when 24 hour data aggregation runs; however, if the 24 hour time slice has already passed, then there is no need to perform the updates because we will (in the next commit) go ahead and recompute 24 hour data. adding support for recomputing 24 hour data refactoring some functions into a utility class This commit also updates the logic in PastDataAggregator for how it invokes the processCacheBlock method. If the 6 hour time slice has finished, it no longer updates the metrics_cache and metrics_cache_index tables. There are additional changes needed for when PastDataAggregator calls processCacheBlock. It needs to determine if the 6 hour and 24 hour data need to be recomputed similar to what is done in the processBatch method. recompute 6 hour data when aggregating late data out of metrics_cache table If the 6 hour time slice of the late data has passed, we need to recompute the 6 hour data just as we do when we pull data from raw_metrics. updating test for recomputing 24 hr data when pulling data from metrics_cache refactoring task scheduling logic Task scheduling logic has been pulled up into BaseAggregator which is now an abstract class. Subclasses are responsible for creating the Runnable tasks. more refactoring to correctly compute the number of schedules processed introduce AggregationTask to provide error handling making schema changes to metrics_cache_index table Some columns have been renamed and a new column has been added. We now have the following timestamp columns - day, collection_time_slice, and insert_time_slice. collection_time_slice is the timestamp provided by the reported data. insert_time_slice is the raw time slice in which the data is inserted. For example, if data is inserted at 17:02, insert_time_slice will be 17:00. And day is the 24 hour time slice of the collection timestamp. insert_time_slice is the new column. Previously there was a scenario in which we could fail to aggregate data. Suppose aggregation for a cache partition failed. Its cache index entry would be left intact., and note that the set of schedule ids was empty. Then late data is reported in the next time slice. At that point, the cache index entry is updated with the schedule ids of the late data. Prior to this commit we would have only aggregated data for the schedule ids with late data. Now we always update the schedule ids for the cache index, even for current data. When we have past/late data, we now compare collection_time_slice with insert_time_slice to determine if we can pull data from metrics_cache. fix scheduling logic for past data aggregation tasks With the addition of the insert_time_slice column, we can now have multiple index entries for a {column_time_slice, start_schedule_id} pair. We can reduce those into a single index entry and submit an aggregation task for that combined entry. PastDataAggregator also now has a deleteCacheIndexEntries function to take care of deleting all index entries for a {column_time_slice, start_schedule_id} pair. more refactoring of processing index entries and adding javadocs refactoring tests and adding javadocs use the same insert time slice for each raw data There is no need to recompute the insert time slice for each raw data. It is sufficient to use insert time slice timestamp as the starting point at which we beging inserting raw data. do not schedule aggregation tasks on I/O thread I had previously and inadvertently perfoming the scheduling of aggregation tasks on an I/O thread. Long running tasks should never run on an I/O thread. I discovered this mistake in a test environment where I was generating NoHostAvailableExceptions because of this mistake. This commit also makes a subtle yet significant change in AggregateNumericMetricMapper. It now checks for nulls which it should have been doing all along since we use weak consistency for reads and writes. The change was needed because I was hitting occassional NPEs with past data aggregation when 1 hr and/or 6 hr aggregates have to be computed. It is easiest to explain with an example. Suppose we are aggregating some past data and we also need to aggregate the 1 hour data into 6 hour data. Almost immediately after computing and storing the 1 hour data for the given time slice, we then fetch all of the 1 hour data for the 6 hour time slice. Unless the query is against the same node to which the preceding write went, the query results might not include all of the data. We do not have to worry about the missing data in the result sets though because we already have the data in memory. updating logging and adding javadocs add support for "decactivating" metrics_cache Deactivating metrics_cache results in data *not* being pulled from it. This applies to both past and current data. Once a specified time has been reached, it is reactived and we start pulling from metrics_cache again. This logic is necessary for two purrposes. First, we need it simplify and speed up the data migration that will be necessary when upgrading to RHQ 4.11. Secondly, it is necessary for the resizing of cache partitions to take effect. For example, suppose we store data for up to 5 schedules per cache partition. We decide to store data for 10 schedules per partition. We need to deactivate the cache while the change takes effect. fixing merge conflicts from rebase Adding data migration support needed during upgrades The C* schema management tool has been changed such that it now supports arbitrary tasks in addition to raw CQL statements. An arbitrary task/step must implement the new Step interface. PopulateCacheIndex is one such custom task that migrates data out of metrics_index and into metrics_cache_index. A property has been added to the system settings for the cache activation time. PopulateCacheIndex sets that property so the server knows when it can start pulling data from metrics_cache during aggregation. And at server start up, MetricsServer is initialized with the property value. fixing merge conflict errors Commit: 2f52d8d6492420b54b0acf9b42667ddb3e8f544d https://github.com/rhq-project/rhq/commit/2f52d8d6492420b54b0acf9b42667dd... Author: John Sanda <jsanda(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/PopulateCacheIndex.java M modules/common/cassandra-schema/src/main/resources/schema/update/0002.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml Log Message: ----------- fixing upgrade for metrics aggregation schema changes Commit: ae8096854128095b09daf871ff13c480f76b5342 https://github.com/rhq-project/rhq/commit/ae8096854128095b09daf871ff13c48... Author: John Mazzitelli <mazz(a)redhat.com> Date: 2014-05-22 (Thu, 22 May 2014) Changed paths: M etc/eclipse-tools/hibernate.cfg.xml M etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml M modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java M modules/common/cassandra-schema/pom.xml M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/CQLStep.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/DBConnectionFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/PopulateCacheIndex.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaUpdateThreadFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/Step.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFile.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java A modules/common/cassandra-schema/src/main/resources/schema/update/0003.xml M modules/common/cassandra-schema/src/test/java/org/rhq/cassandra/schema/UpdateFileTest.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/PingRequest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/SubCategoriesMetadataParserTest.java M modules/core/dbutils/pom.xml A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/intentional-api-changes-since-4.10.0.xml M modules/core/domain/intentional-api-changes-since-4.11.0.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementSchedule.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ProblemResourceComposite.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/DeleteContentRunner.java M modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDescriptorProcessor.java M modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java M modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java M modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentData.java M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java M modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/DashboardView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/summary/ActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/summary/ActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/CoreGUI.gwt.xml M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties R modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.12.0.css M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html R modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.12.0.css R modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.13.js R modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.13.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.48.js A modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.48.min.js R modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.11.0.js A modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.12.0.js M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml M modules/enterprise/pom.xml M modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js M modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MetricsIndexUpdateAccumulator.java M modules/enterprise/server/ear/pom.xml M modules/enterprise/server/installer/pom.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java M modules/enterprise/server/installer/src/main/resources/module/main/module.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java R modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/old-subcat.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerLocal.java A modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/AgentSupportedVersionTest.java A modules/enterprise/server/plugins/jdr-support/pom.xml A modules/enterprise/server/plugins/jdr-support/src/main/java/org/rhq/enterprise/server/plugins/jdr/JdrServerPluginComponent.java A modules/enterprise/server/plugins/jdr-support/src/main/resources/META-INF/rhq-serverplugin.xml M modules/enterprise/server/plugins/pom.xml M modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml A modules/enterprise/server/server-jdr/README.adoc A modules/enterprise/server/server-jdr/pom.xml A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQCollectFiles.java A modules/enterprise/server/server-jdr/src/main/java/org/jboss/as/jdr/commands/RHQStatusCommand.java A modules/enterprise/server/server-jdr/src/main/java/org/rhq/server/jdr/RHQPlugin.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateCacheMapper.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/CacheMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawCacheMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationState.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationType.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Aggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BaseAggregator.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregationScheduler.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregationState.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchException.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchFailureListener.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheIterator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CombinedMetricsIterator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CombinedMetricsPair.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute1HourData.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute24HourData.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute6HourData.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/IndexAggregatesPair.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/MetricsFuturesPair.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/OneHourDataScheduler.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PastDataAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PersistFunctions.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/RawDataScheduler.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/SixHourDataScheduler.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/TaskTracker.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateNumericMetric.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateNumericMetricMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateType.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntry.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntryMapper.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsIndexEntry.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsIndexEntryMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsTable.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/NumericMetric.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/RawNumericMetric.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/DateTimeServiceTest.java A modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/InMemoryMetricsDB.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsPerfTests.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/WaitForRawInserts.java R modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatedMetricsServer.java M modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java M modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/database/src/main/java/org/rhq/plugins/database/DatabasePluginUtil.java M modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml A modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ResultFailedException.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java M modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml M pom.xml Log Message: ----------- Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63 Compare: https://github.com/rhq-project/rhq/compare/804e84f44aac...ae8096854128

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] fabe6f: first cut at metrics_cache table which replaces me...

by John Sanda

Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: fabe6f71458edc2cb5baec031b40c260c613fdb6 https://github.com/rhq-project/rhq/commit/fabe6f71458edc2cb5baec031b40c26... Author: John Sanda <jsanda(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/common/cassandra-schema/pom.xml M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/CQLStep.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/DBConnectionFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/PopulateCacheIndex.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaUpdateThreadFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/Step.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFile.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java M modules/common/cassandra-schema/src/main/resources/schema/update/0002.xml A modules/common/cassandra-schema/src/main/resources/schema/update/0003.xml M modules/common/cassandra-schema/src/test/java/org/rhq/cassandra/schema/UpdateFileTest.java M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java M modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementSchedule.java M modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MetricsIndexUpdateAccumulator.java M modules/enterprise/server/installer/pom.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/installer/src/main/resources/module/main/module.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManager.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateCacheMapper.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/CacheMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawCacheMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationState.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationType.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Aggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BaseAggregator.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregationScheduler.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregationState.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchException.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BatchFailureListener.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheIterator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CombinedMetricsIterator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CombinedMetricsPair.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute1HourData.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute24HourData.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Compute6HourData.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/IndexAggregatesPair.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/MetricsFuturesPair.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/OneHourDataScheduler.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PastDataAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PersistFunctions.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/RawDataScheduler.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/SixHourDataScheduler.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/TaskTracker.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateNumericMetric.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateNumericMetricMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/AggregateType.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntry.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntryMapper.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsIndexEntry.java R modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsIndexEntryMapper.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/MetricsTable.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/NumericMetric.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/RawNumericMetric.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/DateTimeServiceTest.java A modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/InMemoryMetricsDB.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsPerfTests.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/WaitForRawInserts.java R modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/SimulatedMetricsServer.java M modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java Log Message: ----------- first cut at metrics_cache table which replaces metrics_index table The number of reads performed during aggregation grow linearly in proportion to the number of schedules with data to be aggregated. In the worst case scenario when 1 hr and 6 hr data are aggregated along with raw data, the number of reads is 3 * N where N is the number of schedules. If there are a million schedules with data, then a million reads have to be performed just to aggregate the raw data. The new metrics_cache table allows us to dramatically reduce the number of reads. When raw data for example is stored it is now written to both the raw_data table as well as the metrics_cache table. A single partition, i.e., row, in metrics_cache contains data for some configurable number of schedules. Right now it defaults to 100. Each partition in metrics_cache contains data only for a given time slice, e.g., 18:00 to 19:00. Once aggregation has run for that time slice, the partition is deleted. If we have a million schedules with raw data and 100 schedules are being stored per partition in metrics_cache, then the number of reads drops from 1 million to 10,000. That is a 99% reduction in the number of reads. And this reduction will not come with a sharp increase in memory utilization. Some refactoring and fixing bug in TaskTracker Moving code to process batches into Aggregator2 (which will be renamed). Part of the reason for this refactoring is logging. Info or debug level logging can be turned on for AggregationManager without flooding the log file with a lot of log statements. TaskTracker provides synchronization for schedules tasks. It is used to track when all of the scheduled tasks have completed. CountDownLatch cannot be used anymore because it requires you to specify the number of tasks or events up front. This worked fine with the metrics_index table since we were only querying against a single row, and we would iterate over the result set to get the count. It is not know in advance though how many rows there will be in metrics_cache so a different sychronization mechanism was needed. Lastly I should mention that I am not referring to CQL rows here but rather rows at the actual storage layer, i.e., thrift rows. more clean up, removing classes that are now unused. update logging to output number of schedules aggregated cleaning up and re-enabling some tests This commit also updates the logic for determine when aggregation last ran after a server outage. It is a bit more complicated now since with metrics_cache there can be multiple partitions per time slice; so, we have to iterate over all possible partitiion keys per time slice, and if we fail to find any data, only then do we check the previous time slice. It was eaasier with the metrics_index table because there was only one partition per time slice. re-enabling and updating tests in MetricsServerTest update server code to pass min/max schedule ids to MetricsServer adding some initial support for failure handling This commit gives the capability to log stack traces when exceptions occur while processing a batch of futures. More importantly, this is a step towards providing fail fast behavior. Suppose we provide a configurable threshold for failures, and when that threshold is passed, we abort the aggregation so that it can be retried at some later time. making some changes based on feedback from code review The wait() notify() calls have been replaced with a CountDownLatch to address the scenario in which notify() is invoked before wait(). JavaDoc has also been added to explain usage. remove references to now obsolete metrics_index table There is still a reference in the data migration code. That will be addressed in a separate task. changing naming convention for the bucket column in metrics_cache Previously when inserting a row into metrics_index, the bucket column would have the next wider bucket as its value. For example, if we inserted raw data, then we would update metrics_index with the bucket column having a value of "one_hour_metrics". With the schema changes to start using metrics_cache in place of metrics_index, this approach got confusing. The bucket column now is set to the name of the historical table in which data is being written. adding metrics_cache_index table to schema along with initial query support update metrics_cache_index when inserting raw data updating, refactoring tests do not insert raw data that is too old This initial support caps the age at 24 hours. The plan going forward however is to make that cap configurable. update metrics_cache and metrics_cache_index for 1 hour and 6 hour data This commit also introduces a big refactoring of AggregationTests. Tracking and updating expected values was tedious and error prone; consequently, I introduced InMemoryMetricsDB. re-enabling 24 hour data tests adding initial support for aggregating late/past data There are two main changes in this commit. The first is the initial suppport for aggregating late data. That is, raw data that is stored after its time slice has already passed. The schema for metrics_cache_index is changed slightly as well. We now order by the time column before the start_schedule_id column. And we are always storing the day, i.e., hour zero in the time_slice column. This reduces the number of queries that need to be performed when looking to see if there is past data to aggregate. There is still work to do for handling late data along with a bunch of clean up and refactoring. I am trying to consolidate the logic as much as possible for aggregating past data and for current data so as to avoid a lot of the code duplication that is going on right now. major refactoring to consolidate common aggregation functions After adding initial support for aggregating old/past data, it was evident that there was a lot of duplicate functionality around aggregating past and current data. This commit introduces a new class, BaseAggregator, which contains common functions. Aggregation has been renamed to CacheAggregator since it only works with data out of the metrics_cache table. This is also the initial commit for CacheIterator. The computeAggregates function, in its previous forms, took a list of result sets as input. The computations to be performed for past and current data is the same, but the format of the input differed. Now the input is an Iterable so that the function can be used with both past and current data. updating logic for determining most recent raw data after server outage This commit also remove the logic around the min/max scheudle ids. Previously we needed the min and max schedule ids in order to determine the possible set of rows in metrics_cache. This is no longer necessary though since we track the schedule ids in metrics_cache_index. adding more util methods and javadoc to DateTimeService add support for aggregating cache blocks in PastDataAggregator If aggregation for a cache block (i.e., partition in metrics_cache) fails, neither the partition nor the corresponding row in metrics_cache_index are deleted. When a subsequent aggregation run is performed, PastDataAggregator will retry those failed partitions. It can be assumed that all data for the time slice is present in metrics_cache; therefore, we can pull data from metrics_cache instead of raw_metrics and potentially reduce query and I/O overhead. when the 6 hour time slice has passed for late data, recompute the 6 hour data This commit is best explained with an example. Suppose the current time is 06:12. We receive a measurement report with data having a timestamp of 05:50. Aggregation will run again at 07:00. The 6 hour time slice for the late data is 00:00 to 06:00, and that time slice has already passed. When aggregation runs, we not only compute the 1 hour aggregate for the data inserted at 05:50, we also recompute the 6 hour aggregate so that the late data is included. update cache and cache index only when necessary for late data When aggregating late data whose 6 hour time slice has not yet finished, we should update metrics_cache and metrics_cache_index so that the necessary rows are present when 6 hour data aggregation runs. If the 6 hour time slice has already passed, then there is no need to update metrics_cache and metrics_cache_index because we go ahead and recompute the 6 hour data. The same idea holds with 24 hour data. If the 24 hour time slice has not yet finished, then should update metrics_cache and metrics_cache_index so that the necessary rows are present when 24 hour data aggregation runs; however, if the 24 hour time slice has already passed, then there is no need to perform the updates because we will (in the next commit) go ahead and recompute 24 hour data. adding support for recomputing 24 hour data refactoring some functions into a utility class This commit also updates the logic in PastDataAggregator for how it invokes the processCacheBlock method. If the 6 hour time slice has finished, it no longer updates the metrics_cache and metrics_cache_index tables. There are additional changes needed for when PastDataAggregator calls processCacheBlock. It needs to determine if the 6 hour and 24 hour data need to be recomputed similar to what is done in the processBatch method. recompute 6 hour data when aggregating late data out of metrics_cache table If the 6 hour time slice of the late data has passed, we need to recompute the 6 hour data just as we do when we pull data from raw_metrics. updating test for recomputing 24 hr data when pulling data from metrics_cache refactoring task scheduling logic Task scheduling logic has been pulled up into BaseAggregator which is now an abstract class. Subclasses are responsible for creating the Runnable tasks. more refactoring to correctly compute the number of schedules processed introduce AggregationTask to provide error handling making schema changes to metrics_cache_index table Some columns have been renamed and a new column has been added. We now have the following timestamp columns - day, collection_time_slice, and insert_time_slice. collection_time_slice is the timestamp provided by the reported data. insert_time_slice is the raw time slice in which the data is inserted. For example, if data is inserted at 17:02, insert_time_slice will be 17:00. And day is the 24 hour time slice of the collection timestamp. insert_time_slice is the new column. Previously there was a scenario in which we could fail to aggregate data. Suppose aggregation for a cache partition failed. Its cache index entry would be left intact., and note that the set of schedule ids was empty. Then late data is reported in the next time slice. At that point, the cache index entry is updated with the schedule ids of the late data. Prior to this commit we would have only aggregated data for the schedule ids with late data. Now we always update the schedule ids for the cache index, even for current data. When we have past/late data, we now compare collection_time_slice with insert_time_slice to determine if we can pull data from metrics_cache. fix scheduling logic for past data aggregation tasks With the addition of the insert_time_slice column, we can now have multiple index entries for a {column_time_slice, start_schedule_id} pair. We can reduce those into a single index entry and submit an aggregation task for that combined entry. PastDataAggregator also now has a deleteCacheIndexEntries function to take care of deleting all index entries for a {column_time_slice, start_schedule_id} pair. more refactoring of processing index entries and adding javadocs refactoring tests and adding javadocs use the same insert time slice for each raw data There is no need to recompute the insert time slice for each raw data. It is sufficient to use insert time slice timestamp as the starting point at which we beging inserting raw data. do not schedule aggregation tasks on I/O thread I had previously and inadvertently perfoming the scheduling of aggregation tasks on an I/O thread. Long running tasks should never run on an I/O thread. I discovered this mistake in a test environment where I was generating NoHostAvailableExceptions because of this mistake. This commit also makes a subtle yet significant change in AggregateNumericMetricMapper. It now checks for nulls which it should have been doing all along since we use weak consistency for reads and writes. The change was needed because I was hitting occassional NPEs with past data aggregation when 1 hr and/or 6 hr aggregates have to be computed. It is easiest to explain with an example. Suppose we are aggregating some past data and we also need to aggregate the 1 hour data into 6 hour data. Almost immediately after computing and storing the 1 hour data for the given time slice, we then fetch all of the 1 hour data for the 6 hour time slice. Unless the query is against the same node to which the preceding write went, the query results might not include all of the data. We do not have to worry about the missing data in the result sets though because we already have the data in memory. updating logging and adding javadocs add support for "decactivating" metrics_cache Deactivating metrics_cache results in data *not* being pulled from it. This applies to both past and current data. Once a specified time has been reached, it is reactived and we start pulling from metrics_cache again. This logic is necessary for two purrposes. First, we need it simplify and speed up the data migration that will be necessary when upgrading to RHQ 4.11. Secondly, it is necessary for the resizing of cache partitions to take effect. For example, suppose we store data for up to 5 schedules per cache partition. We decide to store data for 10 schedules per partition. We need to deactivate the cache while the change takes effect. fixing merge conflicts from rebase Adding data migration support needed during upgrades The C* schema management tool has been changed such that it now supports arbitrary tasks in addition to raw CQL statements. An arbitrary task/step must implement the new Step interface. PopulateCacheIndex is one such custom task that migrates data out of metrics_index and into metrics_cache_index. A property has been added to the system settings for the cache activation time. PopulateCacheIndex sets that property so the server knows when it can start pulling data from metrics_cache during aggregation. And at server start up, MetricsServer is initialized with the property value. fixing merge conflict errors Commit: 2f52d8d6492420b54b0acf9b42667ddb3e8f544d https://github.com/rhq-project/rhq/commit/2f52d8d6492420b54b0acf9b42667dd... Author: John Sanda <jsanda(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/PopulateCacheIndex.java M modules/common/cassandra-schema/src/main/resources/schema/update/0002.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml Log Message: ----------- fixing upgrade for metrics aggregation schema changes Compare: https://github.com/rhq-project/rhq/compare/94008542694e...2f52d8d64924

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq]

by Jay Shaughnessy

Branch: refs/heads/jshaughn/1094540 Home: https://github.com/rhq-project/rhq

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] dcc27a: [1094540] Agents get permanently backfilled if bac...

by Jay Shaughnessy

Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: dcc27a2c1f1acbf9fb818c92eb27ce278ef6db99 https://github.com/rhq-project/rhq/commit/dcc27a2c1f1acbf9fb818c92eb27ce2... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/PingRequest.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java Log Message: ----------- [1094540] Agents get permanently backfilled if backend database goes offline for a moment Don't unset the backfill flag in the ping logic, just make sure the agent knows the server thinks its down, and let it resolve the situation by sending a full avail report, which when processed will unset the backfill flag. Commit: 94008542694eef157289e6f9884669480021b565 https://github.com/rhq-project/rhq/commit/94008542694eef157289e6f98846694... Author: jshaughn <jshaughn(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/PingRequest.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java Log Message: ----------- Merge pull request #38 from rhq-project/jshaughn/1094540 [1094540] Agents get permanently backfilled if backend database goes off... Compare: https://github.com/rhq-project/rhq/compare/618c6c9d483e...94008542694e

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] c414cd: Changes to coregui: adding Manage Accoung link to ...

by Jiri Kremser

Branch: refs/heads/keycloak-poc Home: https://github.com/rhq-project/rhq Commit: c414cd61ca08e7efe4a5ba921cb08f4c15c0bbc4 https://github.com/rhq-project/rhq/commit/c414cd61ca08e7efe4a5ba921cb08f4... Author: Jirka Kremser <jkremser(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html Log Message: ----------- Changes to coregui: adding Manage Accoung link to Keycloak, and KC logout. Removing some debug information.

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] f9ef97: [BZ 1015334] EAP 6 host controller domain host upd...

by Heiko W. Rupp

Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: f9ef978b72ae6d484a4143990bbc5db8965cc18d https://github.com/rhq-project/rhq/commit/f9ef978b72ae6d484a4143990bbc5db... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- [BZ 1015334] EAP 6 host controller domain host update results in managed servers no longer being "manageable" This commit deprecates 'domainHost' read-only pluginConfiguration property. Instead new trait called 'Domain Host Name' was introduced. BaseServerComponent#validateServerAttributes() now also checks for HC name and if needed re-reads it from host.xml file. When <host name= changes, deprecated 'domainHost' property does not get updated (since there is no way from plugin avail code to update pluginConfiguration on server). BaseServerComponent now handles 'domainHost' in memory, this variable gets updated on component start or in avail code (when server was DOWN and now is UP). Managed servers have domain host name as part of resource key, they get correctly discovered when this change occurs. Commit: e8ad09ec4c43149a06efd2be803caa43386ee956 https://github.com/rhq-project/rhq/commit/e8ad09ec4c43149a06efd2be803caa4... Author: Libor Zoubek <lzoubek(a)redhat.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ResultFailedException.java Log Message: ----------- [BZ 1015334] EAP 6 host controller domain host update results in managed servers no longer being "manageable" Fixed javadocs, renamed variables. Also made access to ASHostName synchronized since it's value can be changed from avail thread and is being read all over other threads. Big change of this commit is getAvailability(). Now we directly read server's name attribute instead of 'launch-type' (which was probably lets-just-read-something) and in case of failure (making we just failed to read value, but connection and other stuf is OK) we re'read <host name from file and try the request again. This approach is more robust than previous, which was only able to detect the change in case server avail went from DOWN to UP. Now, we can detect the change anytime. Commit: 618c6c9d483e4b2624306159c30759cf07b85a89 https://github.com/rhq-project/rhq/commit/618c6c9d483e4b2624306159c30759c... Author: Heiko W. Rupp <hwr(a)pilhuhn.de> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ResultFailedException.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml Log Message: ----------- Merge pull request #23 from lzoubek/bugs/1015334 [BZ 1015334] EAP 6 host controller domain host update results in managed servers no longer being "manageable" Compare: https://github.com/rhq-project/rhq/compare/49b73f38211b...618c6c9d483e

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] 49b73f: [BZ 1090958] Improve waiting for operation results...

by Filip Brychta

Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: 49b73f38211ba2078d38cd4e579159aba0ab8385 https://github.com/rhq-project/rhq/commit/49b73f38211ba2078d38cd4e579159a... Author: Filip Brychta <fbrychta(a)redhat.com> Date: 2014-05-21 (Wed, 21 May 2014) Changed paths: M modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js M modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js Log Message: ----------- [BZ 1090958] Improve waiting for operation results in sample CLI scripts

10 years, 1 month

1
0
0 / 0

[rhq-project/rhq] b1eec7: Manually rev the css and js lib version numbers to...

by mike thompson

Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: b1eec7471e703b4af0b17d3d3f842f87069305b0 https://github.com/rhq-project/rhq/commit/b1eec7471e703b4af0b17d3d3f842f8... Author: Mike Thompson <mithomps(a)redhat.com> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/CoreGUI.gwt.xml R modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.12.0.css M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html R modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.12.0.css R modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.11.0.js A modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.12.0.js Log Message: ----------- Manually rev the css and js lib version numbers to prevent browser caching.

10 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits May 2014