Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/815508f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/815508f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/815508f1 Branch: refs/heads/trunk Commit: 815508f1c240bbbac8246be56e15b1d09c1301b8 Parents: 218743d 06feaef Author: Paulo Motta <pa...@apache.org> Authored: Wed Mar 1 20:33:16 2017 -0300 Committer: Paulo Motta <pa...@apache.org> Committed: Wed Mar 1 20:33:16 2017 -0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/ConnectionHandler.java | 26 +++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/815508f1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c4622ab,ca1aa27..ec3d826 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,8 +1,13 @@@ -2.2.10 +3.0.12 + * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886) + * Update c.yaml doc for offheap memtables (CASSANDRA-13179) + * Faster StreamingHistogram (CASSANDRA-13038) + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) +Merged from 2.2 * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) * Coalescing strategy sleeps too much (CASSANDRA-13090) - * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) http://git-wip-us.apache.org/repos/asf/cassandra/blob/815508f1/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/streaming/ConnectionHandler.java index b83c089,fe551a8..aa1c615 --- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java +++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java @@@ -215,8 -213,10 +215,10 @@@ public class ConnectionHandle { this.socket = socket; this.protocolVersion = protocolVersion; + if (initiator) + sendInitMessage(); - new Thread(this, name() + "-" + session.peer).start(); + new Thread(NamedThreadFactory.threadLocalDeallocator(this), name() + "-" + session.peer).start(); } public ListenableFuture<?> close()
