cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject cassandra git commit: sstableloader does not use MAX_HEAP_SIZE env parameter
Date Thu, 19 Nov 2015 10:12:15 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 1b629c101 -> 4f2337f6d


sstableloader does not use MAX_HEAP_SIZE env parameter

patch by Michael Shuler; reviewed by Robert Stupp for CASSANDRA-10188


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

Branch: refs/heads/cassandra-2.1
Commit: 4f2337f6d04669f2032f612ff556c025c85fadb0
Parents: 1b629c1
Author: Michael Shuler <michael@pbandjelly.org>
Authored: Thu Nov 19 11:07:29 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Thu Nov 19 11:08:14 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt       | 1 +
 bin/sstableloader | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f2337f6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 42dcf3e..94a9ae2 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f2337f6/bin/sstableloader
----------------------------------------------------------------------
diff --git a/bin/sstableloader b/bin/sstableloader
index 26b1e3f..67829b8 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 "$@"


Mime
View raw message