modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
| 6 +-
modules/common/cassandra-common/src/main/resources/cassandra.properties
| 6 ++
modules/common/cassandra-common/src/main/resources/deploy.xml
| 22 +++-------
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
| 9 ++++
4 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit 8c7040f0af3f6508837db6348fa63e8d4db49a62
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Nov 29 11:19:04 2012 -0500
Adding more cassandra config properties to bundle recipe
Making the native transport port and number of threads used by the native
transport configurable. Currently Cassandra defaults to using unlimited threads
which quickly led to OutOfMemoryErrors in my dev environment.
diff --git
a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
index 51390cd..65a47aa 100644
---
a/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
+++
b/modules/common/cassandra-common/src/main/resources/cassandra-1.2.0-beta2/conf/cassandra.yaml
@@ -309,10 +309,10 @@ listen_address: @@listen.address(a)@
# same as the rpc_address. The port however is different and specified below.
start_native_transport: true
# port for the CQL native transport to listen for clients on
-native_transport_port: 9042
+native_transport_port: @@rhq.cassandra.native_transport_port(a)@
# The maximum of thread handling requests. The meaning is the same than
-# rpc_max_threads. The default is unlimited.
-#native_transport_max_threads: 2048
+# rpc_max_threads.
+native_transport_max_threads: @@rhq.casandra.node.native_transport_max_threads(a)@
# Whether to start the thrift rpc server.
diff --git a/modules/common/cassandra-common/src/main/resources/cassandra.properties
b/modules/common/cassandra-common/src/main/resources/cassandra.properties
index 389d765..afbbd7d 100644
--- a/modules/common/cassandra-common/src/main/resources/cassandra.properties
+++ b/modules/common/cassandra-common/src/main/resources/cassandra.properties
@@ -19,6 +19,12 @@ rhq.cassandra.bundle.version=1.0
# or increasing the number of nodes in the cluster will help even out the distribution.
rhq.cassandra.node.num-tokens=256
+# The maximum number of threads handling native CQL requests.
+rhq.casandra.node.native-transport-max-threads=64
+
+# The port for the CQL native transport to listen for clients on.
+rhq.cassandra.native-transport-port=9042
+
# The remaining properties pertain to cluster configuration and are only used in
# development and testing environments when an embedded cluster is used. These
properties
# are also loaded into the container build (when the dev profile is active) in the
diff --git a/modules/common/cassandra-common/src/main/resources/deploy.xml
b/modules/common/cassandra-common/src/main/resources/deploy.xml
index 3292086..9204f00 100644
--- a/modules/common/cassandra-common/src/main/resources/deploy.xml
+++ b/modules/common/cassandra-common/src/main/resources/deploy.xml
@@ -108,24 +108,18 @@
defaultValue=""
type="string"/>
-<!--
- The next two properties, install.schema and replication.factor deal with
- running a CLI or CQL script to install and configure a keyspace.
-
- <rhq:input-property name="install.schema"
- description="If set to true, executes the dbsetup script to
install the rhq schema."
+ <rhq:input-property
name="rhq.casandra.node.native_transport_max_threads"
+ description="The maximum number of threads handling native
CQL requests."
required="false"
- defaultValue="false"
- type="boolean"/>
+ defaultValue="64"
+ type="integer"/>
- <rhq:input-property name="replication.factor"
- description="This sets the replication_factor setting in the
RHQ keyspace definition. The
- replication factor indicates the total number of replicas; so,
a replication factor of 2
- means that there will a total of two copies of data."
+ <rhq:input-property name="rhq.cassandra.native_transport_port"
+ description="The port for the CQL native transport to listen
for clients on."
required="false"
- defaultValue="1"
+ defaultValue="9042"
type="integer"/>
--->
+
<rhq:deployment-unit name="cassandra"
preinstallTarget="pre-install" postinstallTarget="post-install">
<!--
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 6f3b1c0..907aa24 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -564,7 +564,9 @@ rhq.autoinstall.enabled=${rhq.autoinstall.enabled}
rhq.autoinstall.database=auto
rhq.autoinstall.public-endpoint-address=
+#############################################
# Cassandra cluster configuration settings
+#############################################
# A comma-delimited list of hostnames on which Cassandra will run. Cassandra
# nodes use this list to discover other nodes and learn about the cluster
# topology.
@@ -583,6 +585,13 @@ rhq.cassandra.cluster.seeds=
# some variation. Either increasing this value or increasing the number of
# nodes in the cluster will help even out the distribution.
rhq.cassandra.node.num-tokens=${rhq.cassandra.node.num-tokens}
+
+# The port for the CQL native transport to listen for clients on. Default value
+# is 9042.
+rhq.cassandra.native-transport-port=${rhq.cassandra.native-transport-port}
+
+# The maximum number of threads handling native CQL requests. The default value is 64.
+rhq.casandra.node.native-transport-max-threads=${rhq.casandra.node.native-transport-max-threads}
</echo>
</target>
Show replies by date