Updated Branches: refs/heads/cassandra-1.2 3950de9e8 -> 14139455a refs/heads/trunk 025477471 -> 42dc743d6
sstablescrub respects MAX_HEAP_SIZE Patch by Mina Naguib, reviewed by brandonwilliams for CASSANDRA-5562 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14139455 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14139455 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14139455 Branch: refs/heads/cassandra-1.2 Commit: 14139455a5f88b1d64a0686f1d02162293f0d8c9 Parents: 3950de9 Author: Brandon Williams <[email protected]> Authored: Tue May 14 14:08:12 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 14 14:08:12 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/sstablescrub | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14139455/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6432775..498f447 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -32,6 +32,7 @@ Merged from 1.1 * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) * fsync leveled manifest to avoid corruption (CASSANDRA-5535) * Fix Bound intersection computation (CASSANDRA-5551) + * sstablescrub now respects max memory size in cassandra.in.sh (CASSANDRA-5562) 1.2.4 http://git-wip-us.apache.org/repos/asf/cassandra/blob/14139455/bin/sstablescrub ---------------------------------------------------------------------- diff --git a/bin/sstablescrub b/bin/sstablescrub index 437bee0..fdf23a5 100755 --- a/bin/sstablescrub +++ b/bin/sstablescrub @@ -43,7 +43,11 @@ if [ -z $CLASSPATH ]; then exit 1 fi -$JAVA -ea -cp $CLASSPATH -Xmx256M \ +if [ "x$MAX_HEAP_SIZE" = "x" ]; then + MAX_HEAP_SIZE="256M" +fi + +$JAVA -ea -cp $CLASSPATH -Xmx$MAX_HEAP_SIZE \ -Dlog4j.configuration=log4j-tools.properties \ org.apache.cassandra.tools.StandaloneScrubber "$@"
