cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/2] git commit: Set JVM stack size to 160k for Java 7
Date Tue, 12 Jun 2012 13:05:35 GMT
Updated Branches:
  refs/heads/cassandra-1.1 e4ce6b302 -> 26a087c90


Set JVM stack size to 160k for Java 7

patch by slebresne; reviewed by jbellis for CASSANDRA-4275


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26a087c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26a087c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26a087c9

Branch: refs/heads/cassandra-1.1
Commit: 26a087c9017ee63cb13be0e56d85fdda5a56fff4
Parents: 2d0b14e
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jun 12 15:04:26 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jun 12 15:04:26 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt           |    1 +
 conf/cassandra-env.sh |   10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26a087c9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ae102f4..8944988 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@
    which is misleading (CASSANDRA-4319)
  * (cql3) Reject (not yet supported) creation of 2ndardy indexes on tables with
    composite primary keys (CASSANDRA-4328)
+ * Set JVM stack size to 160k for java 7 (CASSANDRA-4275)
 Merged from 1.0:
  * Set gc_grace on index CF to 0 (CASSANDRA-4314)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26a087c9/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 6d4d0da..a3ca022 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -145,13 +145,21 @@ if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then
     JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof"
 fi
 
+
 if [ "`uname`" = "Linux" ] ; then
+    java_version=`"${JAVA:-java}" -version 2>&1 | awk '/version/ {print $3}' | egrep
-o '[0-9]+\.[0-9]+'`
     # reduce the per-thread stack size to minimize the impact of Thrift
     # thread-per-client.  (Best practice is for client connections to
     # be pooled anyway.) Only do so on Linux where it is known to be
     # supported.
-    JVM_OPTS="$JVM_OPTS -Xss128k"
+    if [ "$java_version" = "1.7" ]
+    then
+        JVM_OPTS="$JVM_OPTS -Xss160k"
+    else
+        JVM_OPTS="$JVM_OPTS -Xss128k"
+    fi
 fi
+echo "xss = $JVM_OPTS"
 
 # GC tuning options
 JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" 


Mime
View raw message