[rhq-project/rhq] 3233bd: [BZ 1108095] Use topologyDelta instead of hard req...
by Michael Burman
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 3233bd4902c80f2fba7b15c51bb171fcb15d27ac
https://github.com/rhq-project/rhq/commit/3233bd4902c80f2fba7b15c51bb171f...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsPerfTests.java
Log Message:
-----------
[BZ 1108095] Use topologyDelta instead of hard requestLimit for tests
(cherry picked from commit c6b482c1b687d70d7644ba91dd6c272f701cfd07)
Commit: d20de2f433c98659e3b0edf4ad772a51863c6c7e
https://github.com/rhq-project/rhq/commit/d20de2f433c98659e3b0edf4ad772a5...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
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/storage/StorageClusterMonitor.java
Log Message:
-----------
[BZ 1108095] fix compiler errors
(cherry picked from commit 6958d627983c66813ad12f0e7b42619ddbdfe7b0)
Commit: cf00bbefe39eb8fe1ecb167e6a3a3238fd0ab0b4
https://github.com/rhq-project/rhq/commit/cf00bbefe39eb8fe1ecb167e6a3a323...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
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/storage/StorageClientManagerMBean.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageClientConstants.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java
M modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[BZ 1108095] Updating topology delta will automatically change requestLimit. RequestLimit is no longer allowed to be edited directly
(cherry picked from commit 328cecabaa662cccc0f1d136576c2883c45ca54a)
Compare: https://github.com/rhq-project/rhq/compare/c69cbbd03200...cf00bbefe39e
9 years, 7 months
[rhq-project/rhq] f70948: [BZ 1146138] Add metrics from the Datastax driver,...
by Michael Burman
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: f7094817a304d7e22bda718e1485b3059bc5db13
https://github.com/rhq-project/rhq/commit/f7094817a304d7e22bda718e1485b30...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M modules/common/cassandra-util/src/main/java/org/rhq/cassandra/util/ClusterBuilder.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/storage/StorageClientManagerMBean.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageSession.java
M modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[BZ 1146138] Add metrics from the Datastax driver, and remove some duplicate internal ones.
(cherry picked from commit b73f8e5756c498300dfe801403a6b036d65cf7a6)
Commit: c69cbbd032002cc1f4f66c7691e8e85c56f80107
https://github.com/rhq-project/rhq/commit/c69cbbd032002cc1f4f66c7691e8e85...
Author: Michael Burman <miburman(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
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/storage/StorageClientManagerMBean.java
Log Message:
-----------
Fix MBean method names
(cherry picked from commit 74635ad7e65f4c2425345032f5fa2d07d5e08d1f)
Compare: https://github.com/rhq-project/rhq/compare/e9498be580c6...c69cbbd03200
9 years, 7 months
[rhq-project/rhq] e301dd: [1120417] Break up transaction of updatePluginConf...
by Jay Shaughnessy
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: e301dd8370e5533d0118170abd0d869251f2c8f2
https://github.com/rhq-project/rhq/commit/e301dd8370e5533d0118170abd0d869...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionEnumeration.java
M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceConfigurationMetadataManagerBean.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/resource/metadata/ResourceMetadataManagerLocal.java
Log Message:
-----------
[1120417] Break up transaction of updatePluginConfigurationDefinition into smaller pieces
Another pass here given some oracle test failures in the CI env.
- Fix an issue with PropertyDefinitionSimple.removeEnumeratedValues.
An unexpected problem brought out, I guess, by the Tx reworking,
must be careful not to replace hibernate proxy dealing with
orphanRemoval.
- remove unnecessary REQUIRES_NEW that could lead to locking issues
- remove some dead code
- start shortening xxxInNewTransaction to xxxInNewTx, purely for selfish reasons.
(cherry picked from commit 001a3d1ed50713172774c4ae94effd34523aa9ca)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com>
Commit: e9498be580c6b22de9f4fc7a26f23c62c94c376c
https://github.com/rhq-project/rhq/commit/e9498be580c6b22de9f4fc7a26f23c6...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java
M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java
M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java
M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
M modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java
M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
Log Message:
-----------
In a recent commit for [1120417] (and the resulting oracle test failures) we
added protection against Hibernate errors related to detached sets when
orphanRemoval=true. This applies similar changes to entity classes
outside of the BZ work.
(cherry picked from commit 0e8b7ed217d5ec91ac1313e5fc87829c330b4ca9)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com>
Compare: https://github.com/rhq-project/rhq/compare/189d971483a4...e9498be580c6
9 years, 7 months
[rhq-project/rhq] 26c001: [BZ 1114200] fix handling of late data
by John Sanda
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 26c00149d388eaa976d87d209fca3ebd1f4936c0
https://github.com/rhq-project/rhq/commit/26c00149d388eaa976d87d209fca3eb...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
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
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/DataAggregator.java
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/IndexIterator.java
M modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
Log Message:
-----------
[BZ 1114200] fix handling of late data
My previous commits that involved setting the column timestamp on inserts had
to be reverted. When aggregating late data, it is possible to end up with a
clock tie (See https://wiki.apache.org/cassandra/FAQ#clocktie for details). In
those situations the columns might not get overwritten.
The key thing is to ensure that we do not try to recompute aggregate metrics
when some or all of the source data has already expired, leading to new,
incorrect data. I have put changes in place that should prevent this from
happening.
This commit also includes a change to IndexIterator. It will now continue
loading pages if there is a read timeout. Previously, the exception would go
uncaught causing data aggregation to abort early.
Commit: f02bec4dbe8724656d8a2e448a3e7aa8cfc2c2d1
https://github.com/rhq-project/rhq/commit/f02bec4dbe8724656d8a2e448a3e7aa...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M pom.xml
Log Message:
-----------
fixing merge conflicts
Commit: 189d971483a4176a02b3861f0e25a35c14c02942
https://github.com/rhq-project/rhq/commit/189d971483a4176a02b3861f0e25a35...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
M modules/enterprise/server/itests-2/pom.xml
M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/StorageResultSetFuture.java
Log Message:
-----------
[BZ 1144238] fix compiler error and update dependencies
Conflicts:
pom.xml
Compare: https://github.com/rhq-project/rhq/compare/4b8f550661e5...189d971483a4
9 years, 7 months
