natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into cassandra-5.0

This commit is contained in:
Stefan Miklosovic 2024-08-05 12:19:53 +02:00
parent e2495e182f aa7afeabce
commit 85566a6a02
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -2,6 +2,8 @@
* Deprecate and ignore use_deterministic_table_id (CASSANDRA-19809)
* Prioritize built indexes in IndexStatusManager (CASSANDRA-19400)
* Add java.base/java.lang.reflect among opens for jvm11-client.options (CASSANDRA-19780)
Merged from 4.0:
* Do not spam log with SSLExceptions (CASSANDRA-18839)
5.0-rc2

10
src/java/org/apache/cassandra/transport/ExceptionHandlers.java
View File

@ -23,6 +23,8 @@ import java.net.SocketAddress;
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;
@ -100,7 +102,7 @@ public class ExceptionHandlers
logger.debug("Excluding client exception for {}; address contained in client_error_reporting_exclusions", ctx.channel().remoteAddress(), cause);
return;
}
logClientNetworkingExceptions(cause);
logClientNetworkingExceptions(cause, ctx.channel().remoteAddress());
}
private static boolean isFatal(Throwable cause)
@ -110,7 +112,7 @@ public class ExceptionHandlers
}
}
static void logClientNetworkingExceptions(Throwable cause)
static void logClientNetworkingExceptions(Throwable cause, SocketAddress clientAddress)
{
if (Throwables.anyCauseMatches(cause, t -> t instanceof ProtocolException))
{
@ -133,6 +135,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 {} {}", clientAddress, cause.getMessage());
}
else
{
ClientMetrics.instance.markUnknownException();

3
src/java/org/apache/cassandra/transport/PreV5Handlers.java
View File

@ -343,7 +343,8 @@ public class PreV5Handlers
logger.debug("Excluding client exception for {}; address contained in client_error_reporting_exclusions", ctx.channel().remoteAddress(), cause);
return;
}
ExceptionHandlers.logClientNetworkingExceptions(cause);
ExceptionHandlers.logClientNetworkingExceptions(cause, ctx.channel().remoteAddress());
JVMStabilityInspector.inspectThrowable(cause);
}