From 4f2337f6d04669f2032f612ff556c025c85fadb0 Mon Sep 17 00:00:00 2001
From: Michael Shuler <michael@pbandjelly.org>
Date: Thu, 19 Nov 2015 11:07:29 +0100
Subject: [PATCH] sstableloader does not use MAX_HEAP_SIZE env parameter

patch by Michael Shuler; reviewed by Robert Stupp for CASSANDRA-10188
---
 CHANGES.txt       | 1 +
 bin/sstableloader | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 42dcf3e173..94a9ae2c8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.12
+ * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
  * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
  * Don't remove level info when running upgradesstables (CASSANDRA-10692)
  * Create compression chunk for sending file only (CASSANDRA-10680)
diff --git a/bin/sstableloader b/bin/sstableloader
index 26b1e3f490..67829b8c1a 100755
--- a/bin/sstableloader
+++ b/bin/sstableloader
@@ -43,7 +43,11 @@ if [ -z "$CLASSPATH" ]; then
     exit 1
 fi
 
-"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx256M \
+if [ "x$MAX_HEAP_SIZE" = "x" ]; then
+    MAX_HEAP_SIZE="256M"
+fi
+
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \
         -Dcassandra.storagedir="$cassandra_storagedir" \
         -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.BulkLoader "$@"