[rhq] Branch 'feature/cassandra-backend' - modules/common modules/enterprise
by John Sanda
modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java | 22 ++++++++--
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 3 +
2 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 5d03e97109e7cc045f075a5d94718cf9d657cfc0
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Jan 31 21:41:02 2013 -0500
make jmx port configurable in cassandra installer
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java
index 8794c4d..075de31 100644
--- a/modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java
+++ b/modules/common/cassandra-installer/src/main/java/org/rhq/cassandra/installer/CassandraInstaller.java
@@ -51,8 +51,8 @@ public class CassandraInstaller {
"requests. If not specified, defaults to the value returned by InetAddress.getLocalHost().getHostName().");
hostname.setArgName("HOSTNAME");
- Option dir = new Option("d", "dir", true, "The directory in which to install Cassandra. Defaults to the " +
- "current working directory");
+ Option dir = new Option("d", "dir", true, "The directory in which to install Cassandra. Defaults to " +
+ "./rhq-metrics-node and will be created if it does not already exist.");
dir.setArgName("INSTALL_DIR");
Option seeds = new Option("s", "seeds", true, "A comma-delimited list of hostnames or IP addresses that " +
@@ -60,11 +60,16 @@ public class CassandraInstaller {
"It does not need to specify all nodes in the cluster. Defaults to this nodes hostname.");
seeds.setArgName("SEEDS");
+ Option jmxPort = new Option("j", "jmx-port", true, "The port on which to listen for JMX connections. " +
+ "Defaults to 7200");
+ jmxPort.setArgName("JMX_PORT");
+
options = new Options()
.addOption(new Option("h", "help", false, "Show this message."))
.addOption(hostname)
.addOption(dir)
- .addOption(seeds);
+ .addOption(seeds)
+ .addOption(jmxPort);
}
public void run(CommandLine cmdLine) throws Exception {
@@ -77,7 +82,8 @@ public class CassandraInstaller {
if (cmdLine.hasOption("d")) {
basedir = new File(cmdLine.getOptionValue("d"));
} else {
- basedir = new File(System.getProperty("user.dir"));
+ File currentDir = new File(System.getProperty("user.dir"));
+ basedir = new File(currentDir, "rhq-metrics-node");
}
options.setBasedir(basedir.getAbsolutePath());
@@ -98,6 +104,14 @@ public class CassandraInstaller {
}
options.setSeeds(seeds);
+ Integer jmxPort;
+ if (cmdLine.hasOption("j")) {
+ jmxPort = Integer.parseInt(cmdLine.getOptionValue("j"));
+ } else {
+ jmxPort = 7200;
+ }
+ options.setJmxPort(jmxPort);
+
options.setCommitLogDir(new File(basedir, "commit_log").getAbsolutePath());
options.setSavedCachesDir(new File(basedir, "saved_caches").getAbsolutePath());
options.setDataDir(new File(basedir, "data").getAbsolutePath());
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 97c0200..97f54c0 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -446,6 +446,7 @@ public class InstallerServiceImpl implements InstallerService {
cassandraSchemaManager = createCassandraSchemaManager(serverProperties);
if (ExistingSchemaOption.SKIP != existingSchemaOptionEnum) {
if (cassandraSchemaManager.schemaExists()) {
+ log("Cassandra schema exists.");
if (ExistingSchemaOption.OVERWRITE == existingSchemaOptionEnum) {
log("Cassandra schema exists but installer was told to overwrite it - a new schema will be " +
"created now.");
@@ -456,7 +457,9 @@ public class InstallerServiceImpl implements InstallerService {
log("Updating Cassandra schema.");
cassandraSchemaManager.updateSchema();
} else {
+ log("Cassandra schema does not exist. It will be created now.");
cassandraSchemaManager.createSchema();
+ log("Applying schema updates to Cassandra.");
cassandraSchemaManager.updateSchema();
}
} else {
11 years, 3 months
- 1
- 0