natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-11551-2.2' into cassandra-11551-3.0

This commit is contained in:
Ariel Weisberg 2018-05-05 11:41:07 -04:00
parent 9d498dced6 81b6c9e994
commit 9bf5133742
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -22,6 +22,7 @@
* Fully utilise specified compaction threads (CASSANDRA-14210)
* Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
Merged from 2.2:
* 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)

1
src/java/org/apache/cassandra/net/OutboundTcpConnection.java
View File

@ -267,6 +267,7 @@ public class OutboundTcpConnection extends Thread
// are added between the calls of backlog.size() and backlog.clear()
dropped.addAndGet(backlog.size());
backlog.clear();
currentMsgBufferCount = 0;
break inner;
}
}