cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [04/10] cassandra git commit: Pass JVM_OPTS to standalone tools scripts, CASSANDRA-5969
Date Mon, 01 Jun 2015 15:28:12 GMT
Pass JVM_OPTS to standalone tools scripts, CASSANDRA-5969


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

Branch: refs/heads/trunk
Commit: b7adb03b419d9cbde809823edc08fdabc8b77e1d
Parents: 173f255
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Fri Apr 24 16:43:48 2015 +0800
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jun 1 09:59:02 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt        | 1 +
 bin/json2sstable   | 2 +-
 bin/sstable2json   | 2 +-
 bin/sstablekeys    | 2 +-
 bin/sstableloader  | 2 +-
 bin/sstablescrub   | 2 +-
 bin/sstablesplit   | 2 +-
 bin/sstableupgrade | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b9a0131..7d276f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.0.16:
+ * Allow JVM_OPTS to be passed to standalone tools (CASSANDRA-5969)
  * Fix bad condition in RangeTombstoneList (CASSANDRA-9485)
  * Fix potential StackOverflow when setting CrcCheckChance over JMX (CASSANDRA-9488)
  * Fix null static columns in pages after the first, paged reversed

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/bin/json2sstable
----------------------------------------------------------------------
diff --git a/bin/json2sstable b/bin/json2sstable
index b1bb069..d5656ed 100755
--- a/bin/json2sstable
+++ b/bin/json2sstable
@@ -43,7 +43,7 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" $JVM_OPTS -Dstorage-config="$CASSANDRA_CONF" \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableImport "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/bin/sstable2json
----------------------------------------------------------------------
diff --git a/bin/sstable2json b/bin/sstable2json
index 142bd3e..850e230 100755
--- a/bin/sstable2json
+++ b/bin/sstable2json
@@ -44,7 +44,7 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" $JVM_OPTS -Dstorage-config="$CASSANDRA_CONF" \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableExport "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/bin/sstablekeys
----------------------------------------------------------------------
diff --git a/bin/sstablekeys b/bin/sstablekeys
index 9033881..b1f48fe 100755
--- a/bin/sstablekeys
+++ b/bin/sstablekeys
@@ -48,7 +48,7 @@ if [ $# -eq "0" ]; then
     exit 2
 fi
 
-"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
+"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" $JVM_OPTS -Dstorage-config="$CASSANDRA_CONF" \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.SSTableExport "$@" -e
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/bin/sstableloader
----------------------------------------------------------------------
diff --git a/bin/sstableloader b/bin/sstableloader
index 85335d2..f69fd0f 100755
--- a/bin/sstableloader
+++ b/bin/sstableloader
@@ -43,7 +43,7 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx256M \
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx256M \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.BulkLoader "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/bin/sstablescrub
----------------------------------------------------------------------
diff --git a/bin/sstablescrub b/bin/sstablescrub
index 31ecf02..70e7efb 100755
--- a/bin/sstablescrub
+++ b/bin/sstablescrub
@@ -47,7 +47,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
     MAX_HEAP_SIZE="256M"
 fi
 
-"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx$MAX_HEAP_SIZE \
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneScrubber "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/bin/sstablesplit
----------------------------------------------------------------------
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 81a4232..15f0a04 100755
--- a/bin/sstablesplit
+++ b/bin/sstablesplit
@@ -43,7 +43,7 @@ if [ -z $CLASSPATH ]; then
     exit 1
 fi
 
-$JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx256M \
+$JAVA $JAVA_AGENT -ea -cp $CLASSPATH $JVM_OPTS -Xmx256M \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneSplitter "$@"
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adb03b/bin/sstableupgrade
----------------------------------------------------------------------
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index 5421786..dc72aec 100755
--- a/bin/sstableupgrade
+++ b/bin/sstableupgrade
@@ -47,7 +47,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
     MAX_HEAP_SIZE="256M"
 fi
 
-$JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx$MAX_HEAP_SIZE \
+$JAVA $JAVA_AGENT -ea -cp $CLASSPATH $JVM_OPTS -Xmx$MAX_HEAP_SIZE \
         -Dlog4j.configuration=log4j-tools.properties \
         org.apache.cassandra.tools.StandaloneUpgrader "$@"
 


Mime
View raw message