Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8ae43c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8ae43c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8ae43c0 Branch: refs/heads/trunk Commit: a8ae43c032d4e0631be8f8bff649c2ae781459e5 Parents: 1c8d0ad 1017fe0 Author: Jason Brown <[email protected]> Authored: Thu Nov 29 10:51:16 2018 -0800 Committer: Jason Brown <[email protected]> Committed: Thu Nov 29 10:52:06 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/transport/Message.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ae43c0/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ae43c0/src/java/org/apache/cassandra/transport/Message.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/transport/Message.java index 255af0e,d1f8f28..0571478 --- a/src/java/org/apache/cassandra/transport/Message.java +++ b/src/java/org/apache/cassandra/transport/Message.java @@@ -706,11 -610,23 +706,25 @@@ public abstract class Messag message = "Unexpected exception during request; channel = <unprintable>"; } - if (!alwaysLogAtError && exception instanceof IOException) + // netty wraps SSL errors in a CodecExcpetion + boolean isIOException = exception instanceof IOException || (exception.getCause() instanceof IOException); + if (!alwaysLogAtError && isIOException) { - if (ioExceptionsAtDebugLevel.contains(exception.getMessage())) + String errorMessage = exception.getMessage(); + boolean logAtTrace = false; + + for (String ioException : ioExceptionsAtDebugLevel) + { + // exceptions thrown from the netty epoll transport add the name of the function that failed + // to the exception string (which is simply wrapping a JDK exception), so we can't do a simple/naive comparison + if (errorMessage.contains(ioException)) + { + logAtTrace = true; + break; + } + } + + if (logAtTrace) { // Likely unclean client disconnects logger.trace(message, exception); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
