Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f39a352f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f39a352f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f39a352f Branch: refs/heads/cassandra-3.7 Commit: f39a352fdfb6cb8adb49b7568d72b06ac8f90cf1 Parents: ecdbe3f e000ebb Author: Yuki Morishita <[email protected]> Authored: Wed May 25 19:35:20 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed May 25 19:35:20 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 10 ++++++---- src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/streaming/StreamSession.java | 19 +++++++++++++++---- 4 files changed, 23 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f39a352f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9798d6a,9a449fd..d77aa1e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -9,10 -7,9 +9,11 @@@ Merged from 2.2 * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) * Possible memory leak in NIODataInputStream (CASSANDRA-11867) * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) Merged from 2.1: + * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840) * Do not consider local node a valid source during replace (CASSANDRA-11848) * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f39a352f/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f39a352f/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f39a352f/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/streaming/StreamSession.java index 0a04bd9,2ed6ad1..8dc306d --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@@ -516,10 -518,17 +517,20 @@@ public class StreamSession implements I */ public void onError(Throwable e) { - logger.error("[Stream #{}] Streaming error occurred on session with peer {}{}", planId(), - peer.getHostAddress(), - peer.equals(connecting) ? "" : " through " + connecting.getHostAddress(), - e); + if (e instanceof SocketTimeoutException) + { + logger.error("[Stream #{}] Streaming socket timed out. This means the session peer stopped responding or " + + "is still processing received data. If there is no sign of failure in the other end or a very " + + "dense table is being transferred you may want to increase streaming_socket_timeout_in_ms " + + "property. Current value is {}ms.", planId(), DatabaseDescriptor.getStreamingSocketTimeout(), e); + } + else + { - logger.error("[Stream #{}] Streaming error occurred", planId(), e); ++ logger.error("[Stream #{}] Streaming error occurred on session with peer {}{}", planId(), ++ peer.getHostAddress(), ++ peer.equals(connecting) ? "" : " through " + connecting.getHostAddress(), ++ e); + } // send session failure message if (handler.isOutgoingConnected()) handler.sendMessage(new SessionFailedMessage());
