This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 688bb66 USING_G1 is incorrectly set in cassandra-env.sh if G1 is
explicitly disabled with -UseG1GC
688bb66 is described below
commit 688bb664c5f4733fafc5a7f27362a56c6e157fda
Author: Jeremy Hanna <[email protected]>
AuthorDate: Wed Jul 8 13:05:43 2020 +1000
USING_G1 is incorrectly set in cassandra-env.sh if G1 is explicitly
disabled with -UseG1GC
Patch by Jeremy Hanna, reviewed by David Capwell and brandonwilliams for
CASSANDRA-15931
---
CHANGES.txt | 1 +
conf/cassandra-env.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 231a19b..1940633 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0-alpha5
+ * USING_G1 is incorrectly set in cassandra-env.sh if G1 is explicitly
disabled with -UseG1GC (CASSANDRA-15931)
* Update compaction_throughput_mb_per_sec throttle default to 64
(CASSANDRA-14902)
* Add option to disable compaction at startup (CASSANDRA-15927)
* FBUtilities.getJustLocalAddress falls back to lo ip on misconfigured nodes
(CASSANDRA-15901)
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 10fbf31..a3e51e6 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -120,7 +120,7 @@ echo $JVM_OPTS | grep -q Xms
DEFINED_XMS=$?
echo $JVM_OPTS | grep -q UseConcMarkSweepGC
USING_CMS=$?
-echo $JVM_OPTS | grep -q UseG1GC
+echo $JVM_OPTS | grep -q +UseG1GC
USING_G1=$?
# Override these to set the amount of memory to allocate to the JVM at
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
