From b7adb03b419d9cbde809823edc08fdabc8b77e1d Mon Sep 17 00:00:00 2001
From: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Date: Fri, 24 Apr 2015 16:43:48 +0800
Subject: [PATCH] Pass JVM_OPTS to standalone tools scripts, CASSANDRA-5969

---
 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(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b9a0131af4..7d276f787d 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
diff --git a/bin/json2sstable b/bin/json2sstable
index b1bb069bc5..d5656ed99b 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 "$@"
 
diff --git a/bin/sstable2json b/bin/sstable2json
index 142bd3e678..850e230db1 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 "$@"
 
diff --git a/bin/sstablekeys b/bin/sstablekeys
index 90338813bb..b1f48fe50f 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
 
diff --git a/bin/sstableloader b/bin/sstableloader
index 85335d29c7..f69fd0ff7e 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 "$@"
 
diff --git a/bin/sstablescrub b/bin/sstablescrub
index 31ecf02c08..70e7efbe75 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 "$@"
 
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 81a423201f..15f0a0461f 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 "$@"
 
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index 5421786f89..dc72aec07c 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 "$@"