From b8e08840ee676a4d94f643221627689241e5f51f Mon Sep 17 00:00:00 2001 From: Stefan Miklosovic Date: Tue, 2 Jan 2024 15:06:55 +0100 Subject: [PATCH] Do not spam log with SSLExceptions patch by Stefan Miklosovic; reviewed by Caleb Rackliffe for CASSANDRA-18839 Co-authored-by: James Hu --- CHANGES.txt | 1 + .../org/apache/cassandra/transport/ExceptionHandlers.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index d029c330ae..e8dd62d65d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0.14 + * Do not spam log with SSLExceptions (CASSANDRA-18839) * Fix schema.cql created by a snapshot after dropping more than one column (CASSANDRA-19747) * UnsupportedOperationException when reducing scope for LCS compactions (CASSANDRA-19704) * Make LWT conditions behavior on frozen and non-frozen columns consistent for null column values (CASSANDRA-19637) diff --git a/src/java/org/apache/cassandra/transport/ExceptionHandlers.java b/src/java/org/apache/cassandra/transport/ExceptionHandlers.java index 1c5c976172..e21d78e8f2 100644 --- a/src/java/org/apache/cassandra/transport/ExceptionHandlers.java +++ b/src/java/org/apache/cassandra/transport/ExceptionHandlers.java @@ -22,6 +22,8 @@ import java.io.IOException; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLException; + import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; @@ -104,6 +106,10 @@ public class ExceptionHandlers ClientMetrics.instance.markUnknownException(); logger.trace("Native exception in client networking", cause); } + else if (Throwables.anyCauseMatches(cause, t -> t instanceof SSLException)) + { + NoSpamLogger.log(logger, NoSpamLogger.Level.WARN, 1, TimeUnit.MINUTES, "SSLException in client networking with peer {} {}", ctx.channel().remoteAddress(), cause.getMessage()); + } else { ClientMetrics.instance.markUnknownException();