You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2018/05/05 15:50:08 UTC
[05/10] cassandra git commit: Merge branch 'cassandra-11551-2.2' into
cassandra-11551-3.0
Merge branch 'cassandra-11551-2.2' into cassandra-11551-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bf51337
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bf51337
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bf51337
Branch: refs/heads/cassandra-3.11
Commit: 9bf513374226439388e7d969211c637b085e7b0b
Parents: 9d498dc 81b6c9e
Author: Ariel Weisberg <aw...@apple.com>
Authored: Sat May 5 11:41:07 2018 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Sat May 5 11:41:07 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/9bf51337/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f1dcf52,9faf499..e2f6d07
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
-2.2.13
+3.0.17
+ * Fix progress stats and units in compactionstats (CASSANDRA-12244)
+ * Better handle missing partition columns in system_schema.columns (CASSANDRA-14379)
+ * Delay hints store excise by write timeout to avoid race with decommission (CASSANDRA-13740)
+ * Deprecate background repair and probablistic read_repair_chance table options
+ (CASSANDRA-13910)
+ * Add missed CQL keywords to documentation (CASSANDRA-14359)
+ * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 (CASSANDRA-14332)
+ * Avoid deadlock when running nodetool refresh before node is fully up (CASSANDRA-14310)
+ * Handle all exceptions when opening sstables (CASSANDRA-14202)
+ * Handle incompletely written hint descriptors during startup (CASSANDRA-14080)
+ * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
+ * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252)
+ * Respect max hint window when hinting for LWT (CASSANDRA-14215)
+ * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
+ * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
+ * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
+ * Log when SSTables are deleted (CASSANDRA-14302)
+ * Fix batch commitlog sync regression (CASSANDRA-14292)
+ * Write to pending endpoint when view replica is also base replica (CASSANDRA-14251)
+ * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194)
+ * 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf51337/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 9fbd3a8,4cfe019..65e67c2
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -262,11 -229,10 +262,12 @@@ public class OutboundTcpConnection exte
writeConnected(qm, count == 1 && backlog.isEmpty());
else
{
- // clear out the queue, else gossip messages back up.
- drainedMessages.clear();
+ // Not connected! Clear out the queue, else gossip messages back up. Update dropped
+ // statistics accordingly. Hint: The statistics may be slightly too low, if messages
+ // are added between the calls of backlog.size() and backlog.clear()
+ dropped.addAndGet(backlog.size());
backlog.clear();
+ currentMsgBufferCount = 0;
break inner;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org