modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
| 1
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
| 12 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 8393b06c97a9602a2bfed65b75354f2ddb78d3d2
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Oct 1 17:44:41 2013 -0500
Fix for itest failures dues to properties not being correctly set for storage nodes.
diff --git
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
index a49d77d..dcecf5e 100644
---
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
+++
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java
@@ -235,6 +235,7 @@ public class CassandraClusterManager {
private void getStorageClusterConfiguration() {
this.nodes = new String[deploymentOptions.getNumNodes()];
+ this.jmxPorts = new int[deploymentOptions.getNumNodes()];
for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) {
this.nodes[i] = getLocalIPAddress(i + 1);
this.jmxPorts[i] = deploymentOptions.getJmxPort() + i;
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
index 2db60d8..50a57dd 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java
@@ -132,12 +132,20 @@ public class StrippedDownStartupBeanPreparation {
}
String cqlPort = System.getProperty("rhq.storage.cql-port");
- String gossipPort = System.getProperty("rhq.storage.gossip-port");
-
entityManager.createNativeQuery("update rhq_system_config set property_value
= '" + cqlPort +
"', default_property_value = '" + cqlPort + "'
where property_key = 'STORAGE_CQL_PORT'").executeUpdate();
+
+ String gossipPort = System.getProperty("rhq.storage.gossip-port");
entityManager.createNativeQuery("update rhq_system_config set property_value
= '" + gossipPort +
"', default_property_value = '" + gossipPort + "'
where property_key = 'STORAGE_GOSSIP_PORT'").executeUpdate();
+
+ String storageUserName = System.getProperty("rhq.storage.username");
+ entityManager.createNativeQuery("update rhq_system_config set property_value
= '" + storageUserName +
+ "', default_property_value = '" + storageUserName +
"' where property_key = 'STORAGE_USERNAME'").executeUpdate();
+
+ String storagePassword = System.getProperty("rhq.storage.password");
+ entityManager.createNativeQuery("update rhq_system_config set property_value
= '" + storagePassword +
+ "', default_property_value = '" + storagePassword +
"' where property_key = 'STORAGE_PASSWORD'").executeUpdate();
}
@Timeout
Show replies by date