modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties | 2 - modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 2 - modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 18 ++-------- modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 1 4 files changed, 7 insertions(+), 16 deletions(-)
New commits: commit 0ac8a7e2edaf051813cb7fb70ef9f8ab3136cfda Author: John Sanda jsanda@redhat.com Date: Thu Aug 22 15:31:22 2013 -0400
restrict jmx access to storage node to localhost
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties index 2eb5ab5..1a1a8c2 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/cassandra-jvm.properties @@ -107,6 +107,6 @@ GC_TUNING_OPTS="${use_par_new_gc} ${use_concur_mark_sweep_gc} ${cms_parallel_rem
GC_LOGGING_OPTS="${print_gc_details} ${print_gc_datestamps} ${print_heap_at_gc} ${print_tenuring_distribution} ${print_gc_application_stopped_time} ${print_promotion_failure} ${print_flss_stats} ${gc_log_file}"
-JMX_OPTS="-Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" +JMX_OPTS="-Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
JVM_OPTS="${enable_assertions} ${java_agent} ${use_thread_priorities} ${thread_priority_policy} ${HEAP_OPTS} ${GC_TUNING_OPTS} ${GC_LOGGING_OPTS} ${JMX_OPTS}" 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 588fb3d..2951eaa 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 @@ -107,6 +107,6 @@ GC_TUNING_OPTS="${use_par_new_gc} ${use_concur_mark_sweep_gc} ${cms_parallel_rem
GC_LOGGING_OPTS="${print_gc_details} ${print_gc_datestamps} ${print_heap_at_gc} ${print_tenuring_distribution} ${print_gc_application_stopped_time} ${print_promotion_failure} ${print_flss_stats} ${gc_log_file}"
-JMX_OPTS="-Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" +JMX_OPTS="-Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.port=${jmx_port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
JVM_OPTS="${enable_assertions} ${java_agent} ${use_thread_priorities} ${thread_priority_policy} ${HEAP_OPTS} ${GC_TUNING_OPTS} ${GC_LOGGING_OPTS} ${JMX_OPTS}" diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java index 0fba996..96da057 100644 --- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java +++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java @@ -81,6 +81,7 @@ import org.rhq.plugins.jmx.JMXServerComponent; public class CassandraNodeComponent extends JMXServerComponent<ResourceComponent<?>> implements OperationFacet { private static final Log log = LogFactory.getLog(CassandraNodeComponent.class);
+ private Cluster cluster; private Session cassandraSession; private String host; private ProcessInfo processInfo;
commit dd6b6348a63e8fdc98f926d057dba61c50bfe0ca Author: John Sanda jsanda@redhat.com Date: Thu Aug 22 15:28:12 2013 -0400
only store the nodes own address in rhq-storage-auth.conf
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 3686b6f..bc98a20 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -386,7 +386,10 @@ public class StorageInstaller { deployer.unzipDistro(); deployer.applyConfigChanges(); deployer.updateFilePerms(); - deployer.updateStorageAuthConf(getAddresses(hostname, seeds)); + + Set<InetAddress> addresses = new HashSet<InetAddress>(); + addresses.add(InetAddress.getByName(hostname)); + deployer.updateStorageAuthConf(addresses);
log.info("Finished installing RHQ Storage Node.");
@@ -500,19 +503,6 @@ public class StorageInstaller { return dir; }
- private Set<InetAddress> getAddresses(String hostname, String seeds) throws IOException { - Set<InetAddress> addresses = new HashSet<InetAddress>(); - addresses.add(InetAddress.getByName(hostname)); - - if (!StringUtil.isEmpty(seeds)) { - for (String seed : seeds.split(",")) { - addresses.add(InetAddress.getByName(seed)); - } - } - - return addresses; - } - private PropertiesFileUpdate getServerProperties() { String sysprop = System.getProperty("rhq.server.properties-file"); if (sysprop == null) {