From 9145df897307990a0d7f61f58b5268055c3b69ef Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Thu, 13 Oct 2011 19:26:43 +0000
Subject: [PATCH] limit nodetool to 32MB of heap patch by Zenek Kraweznik;
 reviewed by jbellis for CASSANDRA-3124

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1183046 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt  | 1 +
 bin/nodetool | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 357177fbad..3da613aeaf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
  * (Hadoop) skip empty rows when slicing the entire row (CASSANDRA-2855)
  * Fix handling of tombstone by SSTableExport/Import (CASSANDRA-3357)
  * fix ColumnIndexer to use long offsets (CASSANDRA-3358)
+ * limit nodetool to 32MB of heap (CASSANDRA-3124)
 
 
 1.0.0-final
diff --git a/bin/nodetool b/bin/nodetool
index 6410bfb136..66789427e5 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -55,8 +55,10 @@ case "`uname`" in
     ;;
 esac
 
-$JAVA -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \
-        -Dlog4j.configuration=log4j-tools.properties \
-        org.apache.cassandra.tools.NodeCmd $@
+$JAVA -cp $CLASSPATH \
+      -Xmx32m \
+      -Dlog4j.configuration=log4j-tools.properties \
+      -Dstorage-config=$CASSANDRA_CONF \
+      org.apache.cassandra.tools.NodeCmd $@
 
 # vi:ai sw=4 ts=4 tw=0 et