This is an automated email from the ASF dual-hosted git repository.
mck 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 023eecb Fix check for -Xlog in cassandra-env.sh
023eecb is described below
commit 023eecb03acbc3d8ad751853f7ef067220eba1e9
Author: Adam Holmberg <[email protected]>
AuthorDate: Mon Dec 21 11:26:49 2020 -0600
Fix check for -Xlog in cassandra-env.sh
patch by Yakir Gibraltar; reviewed by Adam Holmberg, Mick Semb Wever for
CASSANDRA-16279
---
CHANGES.txt | 1 +
conf/cassandra-env.sh | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 46c1d13..7fef5a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0-beta5
+ * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
* SSLFactory should initialize SSLContext before setting protocols
(CASSANDRA-16362)
* Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, in
the cassandra-all pom (CASSANDRA-16303)
* Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index a3e51e6..dd088df 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -95,7 +95,7 @@ fi
if [ $JAVA_VERSION -ge 11 ] ; then
# See description of https://bugs.openjdk.java.net/browse/JDK-8046148 for
details about the syntax
# The following is the equivalent to -XX:+PrintGCDetails
-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M
- echo "$JVM_OPTS" | grep -q "^-[X]log:gc"
+ echo "$JVM_OPTS" | grep -qe "-[X]log:gc"
if [ "$?" = "1" ] ; then # [X] to prevent ccm from replacing this line
# only add -Xlog:gc if it's not mentioned in jvm-server.options file
mkdir -p ${CASSANDRA_LOG_DIR}
@@ -103,7 +103,7 @@ if [ $JAVA_VERSION -ge 11 ] ; then
fi
else
# Java 8
- echo "$JVM_OPTS" | grep -q "^-[X]loggc"
+ echo "$JVM_OPTS" | grep -qe "-[X]loggc"
if [ "$?" = "1" ] ; then # [X] to prevent ccm from replacing this line
# only add -Xlog:gc if it's not mentioned in jvm-server.options file
mkdir -p ${CASSANDRA_LOG_DIR}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
