modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties
| 2 +-
modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml
| 2 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 38777a49e6b5c5f92c54c3f41511f5f691d2a548
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Jul 21 21:21:45 2013 -0400
update cassandra deployer itest
diff --git
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties
index a90d23c..774a831 100644
---
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties
+++
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties
@@ -17,9 +17,9 @@ heap_dump_dir=""
thread_stack_size=-Xss180k
-java_agent=""
# Enable jamm when running on Java 6 patch version 23 or higher.
#java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar"
+java_agent=-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar
# GC tuning options
#
diff --git
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml
index 15d08f2..b9e490a 100644
---
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml
+++
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml
@@ -323,7 +323,7 @@ listen_address: localhost
# Internode authentication backend, implementing IInternodeAuthenticator;
# used to allow/disallow connections from peer nodes.
-# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator
+internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator
# Whether to start the native transport server.
# Currently, only the thrift server is started by default because the native
commit 1750170844f6a68b11256ba001fe6cffb53439f6
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Jul 21 21:14:48 2013 -0400
temporarily disable the quartz job that is kicked off when a new node is added
I need to disable the job while working on the internode authentication stuff.
If the maintenance operations run on the nodes, the cluster can actually get
into a bad state because the nodes' authentication conf files have not been
updated which means the new node is not actually part of the cluster.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
index 3f1ec69..c77e229 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
@@ -170,7 +170,7 @@ public class StorageNodeManagerBean implements
StorageNodeManagerLocal, StorageN
entityManager.persist(storageNode);
- scheduleQuartzJob(storageNodes.size());
+// scheduleQuartzJob(storageNodes.size());
}
}
}
Show replies by date