Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 39ab9e052 -> 4c6411f08 refs/heads/cassandra-2.2 a323641ef -> fc675450e refs/heads/cassandra-3.0 cf0b737f1 -> 8bb7077e8 refs/heads/trunk 8765e6a86 -> ed65ff99c
Fix dropping undroppable when message queue is full patch by yukim; reviewed by Paulo Motta for CASSANDRA-10113 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c6411f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c6411f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c6411f0 Branch: refs/heads/cassandra-2.1 Commit: 4c6411f083b9448114a0ba349fc02e60299f6541 Parents: 39ab9e0 Author: Yuki Morishita <[email protected]> Authored: Mon Aug 17 21:31:58 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Sep 29 12:00:01 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index deec093..3364dcd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.10 + * Fix dropping undroppable when message queue is full (CASSANDRA-10113) * Fix potential ClassCastException during paging (CASSANDRA-10352) * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339) * Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java index 27949c6..8b83119 100644 --- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java @@ -518,6 +518,8 @@ public class OutboundTcpConnection extends Thread while (iter.hasNext()) { QueuedMessage qm = iter.next(); + if (!qm.droppable) + continue; if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout()) return; iter.remove();
