From b5f52bfd0e4d77c44aa94996ab4589ecec99dbec Mon Sep 17 00:00:00 2001 From: Benjamin Lerer Date: Fri, 8 Jan 2021 13:16:48 +0100 Subject: [PATCH] Remove OpenJDK log warning patch by Benjamin Lerer; reviewed by Brandon Williams for CASSANDRA-15563 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StartupChecks.java | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index a2890e81e2..ff865c542a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.20 + * Remove OpenJDK log warning (CASSANDRA-15563) * Fix the histogram merge of the table metrics (CASSANDRA-16259) 2.2.19 diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java index f74d3da7cd..893a110fbf 100644 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@ -170,13 +170,7 @@ public class StartupChecks logger.warn("32bit JVM detected. It is recommended to run Cassandra on a 64bit JVM for better performance."); String javaVmName = System.getProperty("java.vm.name"); - if (javaVmName.contains("OpenJDK")) - { - // There is essentially no QA done on OpenJDK builds, and - // clusters running OpenJDK have seen many heap and load issues. - logger.warn("OpenJDK is not recommended. Please upgrade to the newest Oracle Java release"); - } - else if (!javaVmName.contains("HotSpot")) + if (!(javaVmName.contains("HotSpot") || javaVmName.contains("OpenJDK"))) { logger.warn("Non-Oracle JVM detected. Some features, such as immediate unmap of compacted SSTables, may not work as intended"); }