[rhq-project/rhq] 4b7d0d: Bug 885848 - Changing WAR/EAR deployment from expl...
by Thomas Segismont
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 4b7d0dcd0cd73ffbd675923d36ee5f6b9e9b6ab1
https://github.com/rhq-project/rhq/commit/4b7d0dcd0cd73ffbd675923d36ee5f6...
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java
M modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentDiscoveryComponent.java
M modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanDiscoveryComponent.java
M modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedDeploymentDiscoveryComponent.java
M modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java
M modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
Bug 885848 - Changing WAR/EAR deployment from exploded to unexploded (or vice versa) results in resource always being DOWN/Unavailable
Removed connection settings "deploymentName" attribute
Added connection settings "deploymentKey attribute (upgraded from "deploymentName")
We don't need to know if the deployment points to a "vfsfile:/" or "vfszip:/"
Now the profile service "deploymentName" is lazily loaded when the component is started or when it goes down because of NoSuchDeployment
Tested with EAP5.1.2 on WAR and EAR.
-> Deploy new package OK
-> Delete resource OK
-> Restart application OK
(cherry picked from commit 54ce392a7e2e8cc58718102f3e3af60d0ef64ab1)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
9 years, 9 months
[rhq-project/rhq] 5ad0d9: Bug 1032054 - Refresh button on Monitoring/Calltim...
by Thomas Segismont
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 5ad0d98367ab0e3d67d4cea853e2a85639c69340
https://github.com/rhq-project/rhq/commit/5ad0d98367ab0e3d67d4cea853e2a85...
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/CalltimeTableView.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java
Log Message:
-----------
Bug 1032054 - Refresh button on Monitoring/Calltime page does not move 'last 8 hour' time range
Make CalltimeView implement the refresh mechanism instead of CalltimeTableView
The problem was that #refresh was defined both in Table class and AutoResfresh interface.
(cherry picked from commit 945aeb12cbf8bb3e382d1d222ad54ae1f8f960cf)
Signed-off-by: Libor Zoubek <lzoubek(a)redhat.com>
9 years, 9 months
[rhq-project/rhq] ba64f2: [BZ 1114199] Make sure data expiration is consiste...
by John Sanda
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: ba64f2134a51b7e0cbd445032da95d7381b590ce
https://github.com/rhq-project/rhq/commit/ba64f2134a51b7e0cbd445032da95d7...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.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/InsertStatements.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
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/invalid/InvalidMetricsManager.java
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
A modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/InsertStatementsTest.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/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/invalid/InvalidMetricsManagerTest.java
Log Message:
-----------
[BZ 1114199] Make sure data expiration is consistent for late data
Raw data has a retention of 7 days. Previously if we inserted late data that
was a day old, you might expect that it would expire in 6 days; however, the
data actually expire in 7 days. This is because the TTL and column timestamp
cannot be bind variables in Cassandra 1.2.x prepared statements. This commit
fixes the problem so that the one day old data will expire in 6 days. This
is accomplished without sacrificing the use of preared statements.
A cache of prepared statements is now used. Theere is one statement for each
of the past 7 days including today. For data that is 2 days old, we will insert
using a prepared statement that has a column timestamp of today minus 2 days,
and the data will expire in 5 days.
An EJB timer tasks runs every day at 12:00 AM to remove the oldest statements
from the caches and add a new statement for tomorrow. We store an extra
prepared statement for tomorrow to deal with scenarios where data is stored
right at midnight.
9 years, 9 months
[rhq-project/rhq] 3d477b: [1144459] [eap6] Warnings in agent.log - Required ...
by Jay Shaughnessy
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 3d477b03a194a6f1ab61b4d63b756283cc2ddc24
https://github.com/rhq-project/rhq/commit/3d477b03a194a6f1ab61b4d63b75628...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/configuration/ConfigurationEditor.java
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[1144459] [eap6] Warnings in agent.log - Required property 'manage' and 'delete-durable-queue' have a null value
An issue in the plugin descriptor resulted in an ill-defined configuration
definition for the 'Role' "list of maps". Fixing the descriptor should
resolve the issue when resource config is rediscovered for an existing
resource. New resources should be fine from the start.
Also, fix an issue in the config editor when rendering a lot of property
fields. Something that showed up after the all of the properties started
showing up.
The lesson here? Listen to your log file warnings :)
(cherry picked from commit 722d7a462b7848425f3fb28bf5174db0122bb2e3)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com>
9 years, 9 months
[rhq-project/rhq] 722d7a: [1144459] [eap6] Warnings in agent.log - Required ...
by Jay Shaughnessy
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 722d7a462b7848425f3fb28bf5174db0122bb2e3
https://github.com/rhq-project/rhq/commit/722d7a462b7848425f3fb28bf5174db...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/configuration/ConfigurationEditor.java
M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[1144459] [eap6] Warnings in agent.log - Required property 'manage' and 'delete-durable-queue' have a null value
An issue in the plugin descriptor resulted in an ill-defined configuration
definition for the 'Role' "list of maps". Fixing the descriptor should
resolve the issue when resource config is rediscovered for an existing
resource. New resources should be fine from the start.
Also, fix an issue in the config editor when rendering a lot of property
fields. Something that showed up after the all of the properties started
showing up.
The lesson here? Listen to your log file warnings :)
9 years, 9 months
[rhq-project/rhq] 436fe7: [BZ 970784] After successful deployment, initiate ...
by Michael Burman
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 436fe78abebad925ebc6e8159f582e6636987a17
https://github.com/rhq-project/rhq/commit/436fe78abebad925ebc6e8159f582e6...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M modules/core/client-api/intentional-api-changes-since-4.12.0.xml
M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java
M modules/core/dbutils/pom.xml
M modules/core/dbutils/src/main/scripts/dbsetup/2.4.0/db-schema-combined-2.4.0.xml
M modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
M modules/core/domain/intentional-api-changes-since-4.12.0.xml
M modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/deploy/GetDeploymentInfoStep.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
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/BundleDeploymentStatusCheckJob.java
Log Message:
-----------
[BZ 970784] After successful deployment, initiate discovery scan for affected resources on the agent side.
Add new column DEPLOYMENT_DELAY_IN_SECONDS to BundleDeployment
Add new message view_bundle_deployWizard_discoveryDelay
Allow changing the discoveryDelay from recipe (org.rhq.discoveryDelay property) as well as from the UI. If previous liveDeployment had a different value, use that one.
Allow recipe to override values also when using the CLI
Commit: 0648f50f8c09590a2446ad48eed9a5a5d6e21371
https://github.com/rhq-project/rhq/commit/0648f50f8c09590a2446ad48eed9a5a...
Author: Michael Burman <yak(a)iki.fi>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M modules/core/client-api/intentional-api-changes-since-4.12.0.xml
M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java
M modules/core/dbutils/pom.xml
M modules/core/dbutils/src/main/scripts/dbsetup/2.4.0/db-schema-combined-2.4.0.xml
M modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
M modules/core/domain/intentional-api-changes-since-4.12.0.xml
M modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/bundle/deploy/GetDeploymentInfoStep.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
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/BundleDeploymentStatusCheckJob.java
Log Message:
-----------
Merge pull request #123 from burmanm/BZ970784
[BZ 970784] After successful deployment, initiate discovery scan for affected resources on the agent side.
Add new column DEPLOYMENT_DELAY_IN_SECONDS to BundleDeployment
Add new message view_bundle_deployWizard_discoveryDelay
Allow changing the discoveryDelay from recipe (org.rhq.discoveryDelay property) as well as from the UI. If previous liveDeployment had a different value, use that one.
Allow recipe to override values also when using the CLI
Compare: https://github.com/rhq-project/rhq/compare/213427f40921...0648f50f8c09
9 years, 9 months
[rhq-project/rhq] fcae8e: [1073691] Table deadlock issue when processing con...
by Jay Shaughnessy
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: fcae8e7e2e200ca7c0acee03396af59e64add6ee
https://github.com/rhq-project/rhq/commit/fcae8e7e2e200ca7c0acee03396af59...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)
Changed paths:
M modules/core/domain/intentional-api-changes-since-4.12.0.xml
M modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java
M modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java
M modules/core/domain/src/main/java/org/rhq/core/domain/resource/CreateResourceHistory.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java
Log Message:
-----------
[1073691] Table deadlock issue when processing content report due to missing index and very large transactions in ContentServerServiceImpl.mergeDiscoveredPackages
This is yet another legacy code spot subject to scalability and locking
issues. I've made a pass at making it more scalable and less likely to lock:
- No longer process an entire report under an umbrella Tx. Break up the
work into more, smaller, Txs
- Reduce # of DB round trips
- Remove several calls to unindexed queries
- Note, no new indexes have been added at this point. We are still likely
doing one full-table scan of rhq_installed_package when getting the
InstalledPackages for a Resource. We may want to add an index on that FK.
- Altered queries to use indexes
- Removed unused queries from InstalledPackage and PackageVersion
- Added some inline doco to help future genrations
- Removed duplicated remote method decls from ContentManagerLocal
- Fixed an issue in ContentManagerBeanTest and re-enabled a bunch of tests
(cherry picked from commit 9aa0c46edb8a74d7e02557b153b60ae1757e6a32)
Signed-off-by: Thomas Segismont <tsegismo(a)redhat.com>
Conflicts:
modules/core/domain/intentional-api-changes-since-4.12.0.xml
9 years, 9 months
