Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 1b0b113fa -> 81b6c9e99
  refs/heads/cassandra-3.0 9d498dced -> 9bf513374
  refs/heads/cassandra-3.11 bc30a6f73 -> 78b15bfe5
  refs/heads/trunk 68605cf03 -> 6b0247576


Incorrect counting of pending messages in OutboundTcpConnection

Patch by Jaydeepkumar Chovatia; Reviewed by Ariel Weisberg for CASSANDRA-11551


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81b6c9e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81b6c9e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81b6c9e9

Branch: refs/heads/cassandra-2.2
Commit: 81b6c9e994d16e114457dafb85886e03e5d6d2a7
Parents: 1b0b113
Author: jaydeepkumar1984 <[email protected]>
Authored: Tue Apr 24 10:18:34 2018 -0700
Committer: Ariel Weisberg <[email protected]>
Committed: Sat May 5 11:36:21 2018 -0400

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81b6c9e9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1055d51..9faf499 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.13
+ * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81b6c9e9/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 8baac75..4cfe019 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -232,6 +232,7 @@ public class OutboundTcpConnection extends Thread
                         // clear out the queue, else gossip messages back up.
                         drainedMessages.clear();
                         backlog.clear();
+                        currentMsgBufferCount = 0;
                         break inner;
                     }
                 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to