You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2018/11/29 18:54:05 UTC
[1/6] cassandra git commit: Netty epoll IOExceptions caused by
unclean client disconnects being logged at INFO
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 8404260f1 -> e4d0ce6ba
refs/heads/cassandra-3.11 e635317cf -> 1017fe0d8
refs/heads/trunk 1c8d0ad33 -> a8ae43c03
Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO
patch by Sumanth Pasupuleti; reviewed by jasobrown for CASSANDRA-14909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4d0ce6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4d0ce6b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4d0ce6b
Branch: refs/heads/cassandra-3.0
Commit: e4d0ce6ba2d6088c7edf8475f02462e1606f606d
Parents: 8404260
Author: Sumanth Pasupuleti <su...@gmail.com>
Authored: Thu Nov 29 10:11:13 2018 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 29 10:41:47 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/e4d0ce6b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 40016a1..d63016b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.18
+ * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)
* Fix handling of collection tombstones for dropped columns from legacy sstables (CASSANDRA-14912)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4d0ce6b/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index 28c8920..91ece5c 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -608,7 +608,21 @@ public abstract class Message
if (!alwaysLogAtError && exception instanceof IOException)
{
- 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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1017fe0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1017fe0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1017fe0d
Branch: refs/heads/cassandra-3.11
Commit: 1017fe0d8a49365e730a13ec9d851a127d1462a4
Parents: e635317 e4d0ce6
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Nov 29 10:47:32 2018 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 29 10:50:36 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/1017fe0d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 965d945,d63016b..b853ab0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.18
+3.11.4
+ * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870)
+Merged from 3.0:
+ * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)
* Fix handling of collection tombstones for dropped columns from legacy sstables (CASSANDRA-14912)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1017fe0d/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Netty epoll IOExceptions caused by
unclean client disconnects being logged at INFO
Posted by ja...@apache.org.
Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO
patch by Sumanth Pasupuleti; reviewed by jasobrown for CASSANDRA-14909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4d0ce6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4d0ce6b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4d0ce6b
Branch: refs/heads/trunk
Commit: e4d0ce6ba2d6088c7edf8475f02462e1606f606d
Parents: 8404260
Author: Sumanth Pasupuleti <su...@gmail.com>
Authored: Thu Nov 29 10:11:13 2018 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 29 10:41:47 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/e4d0ce6b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 40016a1..d63016b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.18
+ * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)
* Fix handling of collection tombstones for dropped columns from legacy sstables (CASSANDRA-14912)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4d0ce6b/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index 28c8920..91ece5c 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -608,7 +608,21 @@ public abstract class Message
if (!alwaysLogAtError && exception instanceof IOException)
{
- 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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ja...@apache.org.
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 <ja...@gmail.com>
Authored: Thu Nov 29 10:51:16 2018 -0800
Committer: Jason Brown <ja...@gmail.com>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Netty epoll IOExceptions caused by
unclean client disconnects being logged at INFO
Posted by ja...@apache.org.
Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO
patch by Sumanth Pasupuleti; reviewed by jasobrown for CASSANDRA-14909
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4d0ce6b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4d0ce6b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4d0ce6b
Branch: refs/heads/cassandra-3.11
Commit: e4d0ce6ba2d6088c7edf8475f02462e1606f606d
Parents: 8404260
Author: Sumanth Pasupuleti <su...@gmail.com>
Authored: Thu Nov 29 10:11:13 2018 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 29 10:41:47 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/e4d0ce6b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 40016a1..d63016b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.18
+ * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)
* Fix handling of collection tombstones for dropped columns from legacy sstables (CASSANDRA-14912)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4d0ce6b/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index 28c8920..91ece5c 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -608,7 +608,21 @@ public abstract class Message
if (!alwaysLogAtError && exception instanceof IOException)
{
- 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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1017fe0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1017fe0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1017fe0d
Branch: refs/heads/trunk
Commit: 1017fe0d8a49365e730a13ec9d851a127d1462a4
Parents: e635317 e4d0ce6
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Nov 29 10:47:32 2018 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 29 10:50:36 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/1017fe0d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 965d945,d63016b..b853ab0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.18
+3.11.4
+ * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870)
+Merged from 3.0:
+ * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)
* Fix handling of collection tombstones for dropped columns from legacy sstables (CASSANDRA-14912)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1017fe0d/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org