Author: eevans
Date: Fri Aug 6 01:25:07 2010
New Revision: 982845
URL: http://svn.apache.org/viewvc?rev=982845&view=rev
Log:
move JVM_OPTS from cassandra.in.sh to the conf/ dir
Patch by Nick Bailey; review by eevans for CASSANDRA-1347
Added:
cassandra/trunk/conf/cassandra-env.sh
Modified:
cassandra/trunk/bin/cassandra
cassandra/trunk/bin/cassandra.in.sh
cassandra/trunk/contrib/redhat/cassandra
Modified: cassandra/trunk/bin/cassandra
URL:
http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra?rev=982845&r1=982844&r2=982845&view=diff
==============================================================================
--- cassandra/trunk/bin/cassandra (original)
+++ cassandra/trunk/bin/cassandra Fri Aug 6 01:25:07 2010
@@ -90,6 +90,10 @@ if [ -z $CASSANDRA_CONF -o -z $CLASSPATH
exit 1
fi
+if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
+ . "$CASSANDRA_CONF/cassandra-env.sh"
+fi
+
# Special-case path variables.
case "`uname`" in
CYGWIN*)
Modified: cassandra/trunk/bin/cassandra.in.sh
URL:
http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra.in.sh?rev=982845&r1=982844&r2=982845&view=diff
==============================================================================
--- cassandra/trunk/bin/cassandra.in.sh (original)
+++ cassandra/trunk/bin/cassandra.in.sh Fri Aug 6 01:25:07 2010
@@ -14,16 +14,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-cassandra_home=`dirname $0`/..
+if [ "x$CASSANDRA_HOME" = "x" ]; then
+ CASSANDRA_HOME=`dirname $0`/..
+fi
# The directory where Cassandra's configs live (required)
-CASSANDRA_CONF=$cassandra_home/conf
+if [ "x$CASSANDRA_CONF" = "x" ]; then
+ CASSANDRA_CONF=$CASSANDRA_HOME/conf
+fi
# This can be the path to a jar file, or a directory containing the
# compiled classes. NOTE: This isn't needed by the startup script,
# it's just used here in constructing the classpath.
-cassandra_bin=$cassandra_home/build/classes
+cassandra_bin=$CASSANDRA_HOME/build/classes
#cassandra_bin=$cassandra_home/build/cassandra.jar
# JAVA_HOME can optionally be set here
@@ -32,25 +35,6 @@ cassandra_bin=$cassandra_home/build/clas
# The java classpath (required)
CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
-for jar in $cassandra_home/lib/*.jar; do
+for jar in $CASSANDRA_HOME/lib/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done
-
-# Arguments to pass to the JVM
-JVM_OPTS=" \
- -ea \
- \
- -Xms256M \
- -Xmx1G \
- -Xss128k \
- \
- -XX:+UseParNewGC \
- -XX:+UseConcMarkSweepGC \
- -XX:+CMSParallelRemarkEnabled \
- -XX:SurvivorRatio=8 \
- -XX:MaxTenuringThreshold=1 \
- -XX:+HeapDumpOnOutOfMemoryError \
- \
- -Dcom.sun.management.jmxremote.port=8080 \
- -Dcom.sun.management.jmxremote.ssl=false \
- -Dcom.sun.management.jmxremote.authenticate=false"
Added: cassandra/trunk/conf/cassandra-env.sh
URL:
http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra-env.sh?rev=982845&view=auto
==============================================================================
--- cassandra/trunk/conf/cassandra-env.sh (added)
+++ cassandra/trunk/conf/cassandra-env.sh Fri Aug 6 01:25:07 2010
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# The amount of memory to allocate to the JVM at startup, you almost
+# certainly want to adjust this for your environment.
+MAX_HEAP_SIZE="1G"
+
+
+# Here we create the arguments that will get passed to the jvm when
+# starting cassandra.
+JVM_OPTS="$JVM_OPTS -ea"
+
+JVM_OPTS="$JVM_OPTS -Xms256M"
+JVM_OPTS="$JVM_OPTS -Xmx$MAX_HEAP_SIZE"
+JVM_OPTS="$JVM_OPTS -Xss128k"
+
+JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC"
+JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC"
+JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled"
+JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8"
+JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1"
+JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError"
+
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=8080"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
+JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
Modified: cassandra/trunk/contrib/redhat/cassandra
URL:
http://svn.apache.org/viewvc/cassandra/trunk/contrib/redhat/cassandra?rev=982845&r1=982844&r2=982845&view=diff
==============================================================================
--- cassandra/trunk/contrib/redhat/cassandra (original)
+++ cassandra/trunk/contrib/redhat/cassandra Fri Aug 6 01:25:07 2010
@@ -12,7 +12,7 @@
export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/
export CASSANDRA_HOME=/usr/share/cassandra/
export CASSANDRA_INCLUDE=/usr/share/cassandra/cassandra.in.sh
-export CASSANDRA_CONF=/etc/cassandra/
+export CASSANDRA_CONF=/etc/cassandra/conf
export CASSANDRA_OWNR=cassandra
log_file=/var/log/cassandra/cassandra.log
pid_file=/var/run/cassandra/cassandra.pid
