Merge branch 'cassandra-1.2' into trunk

2013-05-14 14:09:22 -05:00 · 2013-05-14 14:09:22 -05:00 · 42dc743d61
parent 0254774719 14139455a5
commit 42dc743d61
2 changed files with 6 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -80,6 +80,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
--- 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 "$@"