Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6FD8918405 for ; Thu, 19 Nov 2015 10:12:15 +0000 (UTC) Received: (qmail 26915 invoked by uid 500); 19 Nov 2015 10:12:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 26884 invoked by uid 500); 19 Nov 2015 10:12:15 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 26873 invoked by uid 99); 19 Nov 2015 10:12:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2015 10:12:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 17D51E17CB; Thu, 19 Nov 2015 10:12:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: sstableloader does not use MAX_HEAP_SIZE env parameter Date: Thu, 19 Nov 2015 10:12:15 +0000 (UTC) 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 Authored: Thu Nov 19 11:07:29 2015 +0100 Committer: Robert Stupp 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 "$@"