From 81b6c9e994d16e114457dafb85886e03e5d6d2a7 Mon Sep 17 00:00:00 2001
From: jaydeepkumar1984 <chovatia.jaydeep@gmail.com>
Date: Tue, 24 Apr 2018 10:18:34 -0700
Subject: [PATCH] Incorrect counting of pending messages in
 OutboundTcpConnection

Patch by Jaydeepkumar Chovatia; Reviewed by Ariel Weisberg for CASSANDRA-11551
---
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1055d51d1a..9faf4990a2 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)
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 8baac7553a..4cfe0196ce 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;
                     }
                 }