Author: jbellis Date: Thu Oct 13 19:26:43 2011 New Revision: 1183046 URL: http://svn.apache.org/viewvc?rev=1183046&view=rev Log: limit nodetool to 32MB of heap patch by Zenek Kraweznik; reviewed by jbellis for CASSANDRA-3124
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt cassandra/branches/cassandra-1.0/bin/nodetool Modified: cassandra/branches/cassandra-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1183046&r1=1183045&r2=1183046&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0/CHANGES.txt Thu Oct 13 19:26:43 2011 @@ -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 Modified: cassandra/branches/cassandra-1.0/bin/nodetool URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/bin/nodetool?rev=1183046&r1=1183045&r2=1183046&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/bin/nodetool (original) +++ cassandra/branches/cassandra-1.0/bin/nodetool Thu Oct 13 19:26:43 2011 @@ -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