Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9ff7fe1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9ff7fe1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9ff7fe1 Branch: refs/heads/cassandra-3.5 Commit: b9ff7fe13740a21da25ed6414ea17fe5530652ea Parents: 7e220bc 561000a Author: Yuki Morishita <yu...@apache.org> Authored: Thu Mar 10 13:00:09 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Mar 10 13:00:09 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 7 +++---- .../net/IncomingStreamingConnection.java | 7 ++++++- .../cassandra/streaming/ConnectionHandler.java | 21 +++++++++++++------- .../cassandra/streaming/StreamSession.java | 2 ++ 5 files changed, 26 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b9596d9,4b505f8..045b867 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,5 +1,33 @@@ -2.1.14 +2.2.6 + * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) + * Add missing newline at end of bin/cqlsh (CASSANDRA-11325) + * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297) + * Unresolved hostname leads to replace being ignored (CASSANDRA-11210) + * Fix filtering on non-primary key columns for thrift static column families + (CASSANDRA-6377) + * Only log yaml config once, at startup (CASSANDRA-11217) + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) + * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) + * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/streaming/ConnectionHandler.java index 1ec7e1c,52268b2..d4662c7 --- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java +++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java @@@ -170,14 -175,10 +180,11 @@@ public class ConnectionHandle protected static ReadableByteChannel getReadChannel(Socket socket) throws IOException { - ReadableByteChannel in = socket.getChannel(); - // socket channel is null when encrypted(SSL) - return in == null - ? Channels.newChannel(socket.getInputStream()) - : in; + //we do this instead of socket.getChannel() so socketSoTimeout is respected + return Channels.newChannel(socket.getInputStream()); } + @SuppressWarnings("resource") public void sendInitMessage(Socket socket, boolean isForOutgoing) throws IOException { StreamInitMessage message = new StreamInitMessage( http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ff7fe1/src/java/org/apache/cassandra/streaming/StreamSession.java ----------------------------------------------------------------------
