You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2016/12/03 06:38:16 UTC
[04/10] cassandra git commit: Saving/restoring MAX_HEAP_SIZE nodetool
Saving/restoring MAX_HEAP_SIZE nodetool
Patch by Brad Vernon; Reviewed by Eduard Tudenhoefner for CASSANDRA-12739
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/255505ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/255505ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/255505ea
Branch: refs/heads/trunk
Commit: 255505ea7915a1261788018ede37ee8c82ac2062
Parents: 8cb9693
Author: Brad Vernon <br...@datastax.com>
Authored: Fri Sep 30 15:00:20 2016 -0700
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Fri Dec 2 22:32:07 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/nodetool | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/255505ea/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 58a29e7..fff1d54 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/255505ea/bin/nodetool
----------------------------------------------------------------------
diff --git a/bin/nodetool b/bin/nodetool
index b6a6fbf..b1cfba5 100755
--- a/bin/nodetool
+++ b/bin/nodetool
@@ -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