Saving/restoring MAX_HEAP_SIZE nodetool

Patch by Brad Vernon; Reviewed by Eduard Tudenhoefner for CASSANDRA-12739
This commit is contained in:
Brad Vernon 2016-09-30 15:00:20 -07:00 committed by Jeff Jirsa
parent 8cb9693a6b
commit 255505ea79
2 changed files with 3 additions and 0 deletions

View File

@ -1,4 +1,5 @@
3.0.11
* Nodetool should use a more sane max heap size (CASSANDRA-12739)
* LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
* AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
* Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)

View File

@ -58,7 +58,9 @@ fi
# Run cassandra-env.sh to pick up JMX_PORT
if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
JVM_OPTS_SAVE=$JVM_OPTS
MAX_HEAP_SIZE_SAVE=$MAX_HEAP_SIZE
. "$CASSANDRA_CONF/cassandra-env.sh"
MAX_HEAP_SIZE=$MAX_HEAP_SIZE_SAVE
JVM_OPTS=$JVM_OPTS_SAVE
fi