Author: [email protected]
Date: Thu Mar 10 10:26:29 2011
New Revision: 866
Log:
[AMDATU-287] Fixed configurable storage port
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraConfigurationService.java
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/mock/CassandraConfigurationServiceMock.java
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
trunk/pom.xml
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraConfigurationService.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraConfigurationService.java
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/CassandraConfigurationService.java
Thu Mar 10 10:26:29 2011
@@ -43,22 +43,22 @@
* Configuration key for the working directory to use for Cassandra
*/
public static final String CONFIG_WORKDIR = "workdir";
-
+
/**
* Configuration key for the commit log directory to use for Cassandra
*/
public static final String COMMITLOG_DIR = "commitlogdir";
-
+
/**
* Configuration key for the datafile directory to use for Cassandra
*/
public static final String DATAFILE_DIR = "datafiledir";
-
+
/**
* Configuration key for the saved caches directory to use for Cassandra
*/
public static final String SAVEDCACHES_DIR = "savedcachesdir";
-
+
/**
* Configuration key for the log4j log directory to use for Cassandra
*/
@@ -100,6 +100,11 @@
public static final String RPC_PORT = "rpc_port";
/**
+ * Configuration key for the storage port
+ */
+ public static final String STORAGE_PORT = "storage_port";
+
+ /**
* Configuration key that stores a list of IP addresses that are part of
this cluster. The IP addresses
* are stored comma separated in ConfigurationAdmin.
*/
@@ -167,6 +172,12 @@
int getRPCPort();
/**
+ * Returns the Storage port.
+ * @return the Storage port.
+ */
+ int getStoragePort();
+
+ /**
* Returns the name of the cluster that this node is part of.
* @return the name of the cluster that this node is part of.
*/
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraConfigurationServiceImpl.java
Thu Mar 10 10:26:29 2011
@@ -56,6 +56,7 @@
private boolean m_bootstrapMode;
private String m_rpcAddress;
private int m_rpcPort;
+ private int m_storagePort;
private String m_clusterName;
/**
@@ -65,7 +66,7 @@
public void init() {
m_logService.log(LogService.LOG_DEBUG, "Preparing Cassandra
configuration");
m_logService.log(LogService.LOG_INFO, "Cassandra work directory=" +
m_workDir.getAbsolutePath());
-
+
// Initialize storage configuration
// Load the URL of the storage-conf.xml and write it file using the
config template
// manager, which automatically replaces configuration entries in that
file
@@ -94,7 +95,7 @@
log4jPropertiesFile.deleteOnExit();
}
catch (IOException e) {
- m_logService.log(LogService.LOG_ERROR, "Could not replace
configuration entries in storage-conf.xml", e);
+ m_logService.log(LogService.LOG_ERROR, "Could not replace
configuration entries in cassandra.yaml", e);
}
// cassandra-foreground must be set to true, otherwise Cassandra will
close System err and out streams such
@@ -123,6 +124,7 @@
m_rpcAddress = dictionary.get(LISTEN_ADDRESS).toString();
}
m_rpcPort = Integer.parseInt(dictionary.get(RPC_PORT).toString());
+ m_storagePort =
Integer.parseInt(dictionary.get(STORAGE_PORT).toString());
m_clusterName = dictionary.get(CLUSTER_NAME).toString();
}
}
@@ -156,10 +158,10 @@
return result;
} else if (CassandraConfigurationService.PID.equals(pid) &&
m_amdatuDir != null) {
if
(CassandraConfigurationService.CONFIG_WORKDIR.equals(property)
- ||
CassandraConfigurationService.COMMITLOG_DIR.equals(property)
- ||
CassandraConfigurationService.DATAFILE_DIR.equals(property)
- ||
CassandraConfigurationService.SAVEDCACHES_DIR.equals(property)
- ||
CassandraConfigurationService.LOG4JLOG_DIR.equals(property)) {
+ ||
CassandraConfigurationService.COMMITLOG_DIR.equals(property)
+ ||
CassandraConfigurationService.DATAFILE_DIR.equals(property)
+ ||
CassandraConfigurationService.SAVEDCACHES_DIR.equals(property)
+ ||
CassandraConfigurationService.LOG4JLOG_DIR.equals(property)) {
// If amdatu.dir is provided as a system property, convert
the directories to absolute directories
String dir = m_amdatuDir + File.separator +
configValue.toString();
dir = dir.replace("\\", "/");
@@ -195,6 +197,10 @@
return m_rpcPort;
}
+ public int getStoragePort() {
+ return m_storagePort;
+ }
+
public String getClustername() {
return m_clusterName;
}
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonActivatorImpl.java
Thu Mar 10 10:26:29 2011
@@ -85,6 +85,7 @@
m_logService.log(LogService.LOG_INFO, " Write consistency level = " +
m_configuration.getWriteConsistencyLevel());
m_logService.log(LogService.LOG_INFO, " RPC address = " +
m_configuration.getRPCAddress());
m_logService.log(LogService.LOG_INFO, " RPC Port = " +
m_configuration.getRPCPort());
+ m_logService.log(LogService.LOG_INFO, " Storage Port = " +
m_configuration.getStoragePort());
// Activate the daemon from a separate thread, as the activate()
method never returns
new CassandraDaemonActivateThread().start();
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
Thu Mar 10 10:26:29 2011
@@ -155,7 +155,7 @@
sliced_buffer_size_in_kb: 64
# TCP port, for commands and data
-storage_port: 7000
+storage_port: ${org.amdatu.core.cassandra.application/storage_port}
# Address to bind to and tell other Cassandra nodes to connect to. You
# _must_ change this if you want multiple nodes to be able to
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/mock/CassandraConfigurationServiceMock.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/mock/CassandraConfigurationServiceMock.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/mock/CassandraConfigurationServiceMock.java
Thu Mar 10 10:26:29 2011
@@ -49,6 +49,10 @@
public int getRPCPort() {
return 9160;
}
+
+ public int getStoragePort() {
+ return 7000;
+ }
public String getClustername() {
return "Amdatu Unit Test Cluster";
Modified:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
==============================================================================
---
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
(original)
+++
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
Thu Mar 10 10:26:29 2011
@@ -78,4 +78,7 @@
rpc_address=${cassandra.rpc_address}
# port for Thrift to listen for clients on
-rpc_port=${cassandra.rpc_port}
\ No newline at end of file
+rpc_port=${cassandra.rpc_port}
+
+# storage port
+storage_port=${cassandra.storage_port}
\ No newline at end of file
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Mar 10 10:26:29 2011
@@ -73,6 +73,9 @@
<!-- The RPC port for Thrift communication -->
<cassandra.rpc_port>9160</cassandra.rpc_port>
+ <!-- The storage port -->
+ <cassandra.storage_port>7000</cassandra.storage_port>
+
<!-- JMX configuration -->
<jmxremote.port />
<jmxremote.ssl>false</jmxremote.ssl>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
