Author: ivol37 at gmail.com
Date: Thu Jan 13 09:49:45 2011
New Revision: 616
Log:
[AMDATU-254] rcp address and port are now configurable
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
trunk/pom.xml
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 Jan 13 09:49:45 2011
@@ -143,9 +143,10 @@
#
# Leaving this blank has the same effect it does for ListenAddress,
# (i.e. it will be based on the configured hostname of the node).
-rpc_address: localhost
+rpc_address: ${org.amdatu.core.cassandra.application/rpc_address}
+
# port for Thrift to listen for clients on
-rpc_port: 9160
+rpc_port: ${org.amdatu.core.cassandra.application/rpc_port}
# enable or disable keepalive on rpc connections
rpc_keepalive: true
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 Jan 13 09:49:45 2011
@@ -70,4 +70,12 @@
# to later build a cluster including this first instance, it is recommended to
set the
# initial token?s value to zero. This simplifies load balancing as you later
expand the
# cluster.
-initial_token=${cassandra.initial_token}
\ No newline at end of file
+initial_token=${cassandra.initial_token}
+
+# The address to bind the Thrift RPC service to -- clients connect here.
+# Usually this is the same value as the listen_address. If you leave this
+# blank that is exactly what will happen, so it is recommended to leave this
empty
+rpc_address=${cassandra.rpc_address}
+
+# port for Thrift to listen for clients on
+rpc_port=${cassandra.rpc_port}
\ No newline at end of file
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
Thu Jan 13 09:49:45 2011
@@ -76,6 +76,8 @@
properties.put("consistency_level_read", "ONE");
properties.put("consistency_level_write", "ONE");
properties.put("initial_token", "");
+ properties.put("rpc_address", "");
+ properties.put("rpc_port", "9160");
config.update(properties);
}
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Jan 13 09:49:45 2011
@@ -67,6 +67,12 @@
recommended to set the initial token?s value to zero -->
<cassandra.initial_token></cassandra.initial_token>
+ <!-- The RPC address for other Thrift clients to connect to -->
+ <cassandra.rpc_address></cassandra.rpc_address>
+
+ <!-- The RPC port for Thrift communication -->
+ <cassandra.rpc_port>9160</cassandra.rpc_port>
+
<!--
Version numbers of dependent libraries
-->
