Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36375f8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36375f8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36375f8b Branch: refs/heads/cassandra-3.11 Commit: 36375f8b5571891e318ba4abaa61d96477e52e22 Parents: 5133526 51bf518 Author: Paulo Motta <pa...@apache.org> Authored: Sat Jan 13 01:25:10 2018 -0200 Committer: Paulo Motta <pa...@apache.org> Committed: Sat Jan 13 01:25:10 2018 -0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a748e28,0453ddd..973939e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ -3.0.16 +3.11.2 + * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630) + * Enable CDC unittest (CASSANDRA-14141) + * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139) + * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143) + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083) + * Avoid exposing compaction strategy index externally (CASSANDRA-14082) + * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109) + * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084) + * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948) + * Remove OpenJDK log warning (CASSANDRA-13916) + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079) + * Cache disk boundaries (CASSANDRA-13215) + * Add asm jar to build.xml for maven builds (CASSANDRA-11193) + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * Update jackson JSON jars (CASSANDRA-13949) + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) +Merged from 3.0: * Set encoding for javadoc generation (CASSANDRA-14154) * Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104) * Improve commit log chain marker updating (CASSANDRA-14108) http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java index 6cd1064,9fbd3a8..c211f0b --- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java @@@ -541,8 -544,9 +541,8 @@@ public class OutboundTcpConnection exte } catch (IOException e) { - socket = null; + disconnect(); - if (logger.isTraceEnabled()) - logger.trace("unable to connect to " + poolReference.endPoint(), e); + logger.debug("Unable to connect to {}", poolReference.endPoint(), e); Uninterruptibles.sleepUninterruptibly(OPEN_RETRY_DELAY, TimeUnit.MILLISECONDS); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
