You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/05/26 00:36:02 UTC
[01/15] cassandra git commit: Set default
streaming_socket_timeout_in_ms to 24 hours
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 6100eb2c1 -> d27f9b0b7
refs/heads/cassandra-2.2 907c8263b -> 2bacc9a5c
refs/heads/cassandra-3.0 ed84bbcbb -> e000ebbe5
refs/heads/cassandra-3.7 ecdbe3f91 -> f39a352fd
refs/heads/trunk 87def2ef3 -> 9c8ee4c73
Set default streaming_socket_timeout_in_ms to 24 hours
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11840
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d27f9b0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d27f9b0b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d27f9b0b
Branch: refs/heads/cassandra-2.1
Commit: d27f9b0b772ba60fece3f3b1101ff63aabdad1fb
Parents: 6100eb2
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed May 18 12:40:01 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:26:51 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d914420..8dfa02a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
* Do not consider local node a valid source during replace (CASSANDRA-11848)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 90c5be4..7f2a6fa 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -635,10 +635,12 @@ request_timeout_in_ms: 10000
cross_node_timeout: false
# Set socket timeout for streaming operation.
-# The stream session is failed if no data is received by any of the
-# participants within that period.
-# Default value is 3600000, which means streams timeout after an hour.
-# streaming_socket_timeout_in_ms: 3600000
+# The stream session is failed if no data/ack is received by any of the participants
+# within that period, which means this should also be sufficient to stream a large
+# sstable or rebuild table indexes.
+# Default value is 86400000ms, which means stale streams timeout after 24 hours.
+# A value of zero means stream sockets should never time out.
+# streaming_socket_timeout_in_ms: 86400000
# phi value that must be reached for a host to be marked down.
# most users should never need to adjust this.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 9ff7096..2c5e36a 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -85,7 +85,7 @@ public class Config
public volatile Long truncate_request_timeout_in_ms = 60000L;
- public Integer streaming_socket_timeout_in_ms = 3600000;
+ public Integer streaming_socket_timeout_in_ms = 86400000; //24 hours
public boolean cross_node_timeout = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 642e837..4eb8557 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.streaming;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.SocketTimeoutException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -502,7 +503,17 @@ public class StreamSession implements IEndpointStateChangeSubscriber
*/
public void onError(Throwable e)
{
- logger.error("[Stream #{}] Streaming error occurred", planId(), 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);
+ }
// send session failure message
if (handler.isOutgoingConnected())
handler.sendMessage(new SessionFailedMessage());
[05/15] cassandra git commit: Set default
streaming_socket_timeout_in_ms to 24 hours
Posted by yu...@apache.org.
Set default streaming_socket_timeout_in_ms to 24 hours
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11840
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d27f9b0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d27f9b0b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d27f9b0b
Branch: refs/heads/cassandra-3.7
Commit: d27f9b0b772ba60fece3f3b1101ff63aabdad1fb
Parents: 6100eb2
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed May 18 12:40:01 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:26:51 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d914420..8dfa02a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
* Do not consider local node a valid source during replace (CASSANDRA-11848)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 90c5be4..7f2a6fa 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -635,10 +635,12 @@ request_timeout_in_ms: 10000
cross_node_timeout: false
# Set socket timeout for streaming operation.
-# The stream session is failed if no data is received by any of the
-# participants within that period.
-# Default value is 3600000, which means streams timeout after an hour.
-# streaming_socket_timeout_in_ms: 3600000
+# The stream session is failed if no data/ack is received by any of the participants
+# within that period, which means this should also be sufficient to stream a large
+# sstable or rebuild table indexes.
+# Default value is 86400000ms, which means stale streams timeout after 24 hours.
+# A value of zero means stream sockets should never time out.
+# streaming_socket_timeout_in_ms: 86400000
# phi value that must be reached for a host to be marked down.
# most users should never need to adjust this.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 9ff7096..2c5e36a 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -85,7 +85,7 @@ public class Config
public volatile Long truncate_request_timeout_in_ms = 60000L;
- public Integer streaming_socket_timeout_in_ms = 3600000;
+ public Integer streaming_socket_timeout_in_ms = 86400000; //24 hours
public boolean cross_node_timeout = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 642e837..4eb8557 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.streaming;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.SocketTimeoutException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -502,7 +503,17 @@ public class StreamSession implements IEndpointStateChangeSubscriber
*/
public void onError(Throwable e)
{
- logger.error("[Stream #{}] Streaming error occurred", planId(), 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);
+ }
// send session failure message
if (handler.isOutgoingConnected())
handler.sendMessage(new SessionFailedMessage());
[04/15] cassandra git commit: Set default
streaming_socket_timeout_in_ms to 24 hours
Posted by yu...@apache.org.
Set default streaming_socket_timeout_in_ms to 24 hours
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11840
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d27f9b0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d27f9b0b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d27f9b0b
Branch: refs/heads/cassandra-3.0
Commit: d27f9b0b772ba60fece3f3b1101ff63aabdad1fb
Parents: 6100eb2
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed May 18 12:40:01 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:26:51 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d914420..8dfa02a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
* Do not consider local node a valid source during replace (CASSANDRA-11848)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 90c5be4..7f2a6fa 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -635,10 +635,12 @@ request_timeout_in_ms: 10000
cross_node_timeout: false
# Set socket timeout for streaming operation.
-# The stream session is failed if no data is received by any of the
-# participants within that period.
-# Default value is 3600000, which means streams timeout after an hour.
-# streaming_socket_timeout_in_ms: 3600000
+# The stream session is failed if no data/ack is received by any of the participants
+# within that period, which means this should also be sufficient to stream a large
+# sstable or rebuild table indexes.
+# Default value is 86400000ms, which means stale streams timeout after 24 hours.
+# A value of zero means stream sockets should never time out.
+# streaming_socket_timeout_in_ms: 86400000
# phi value that must be reached for a host to be marked down.
# most users should never need to adjust this.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 9ff7096..2c5e36a 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -85,7 +85,7 @@ public class Config
public volatile Long truncate_request_timeout_in_ms = 60000L;
- public Integer streaming_socket_timeout_in_ms = 3600000;
+ public Integer streaming_socket_timeout_in_ms = 86400000; //24 hours
public boolean cross_node_timeout = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 642e837..4eb8557 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.streaming;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.SocketTimeoutException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -502,7 +503,17 @@ public class StreamSession implements IEndpointStateChangeSubscriber
*/
public void onError(Throwable e)
{
- logger.error("[Stream #{}] Streaming error occurred", planId(), 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);
+ }
// send session failure message
if (handler.isOutgoingConnected())
handler.sendMessage(new SessionFailedMessage());
[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/e000ebbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e000ebbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e000ebbe
Branch: refs/heads/cassandra-3.7
Commit: e000ebbe50dafc502255bf5fb5dbfba24f90a8e5
Parents: ed84bbc 2bacc9a
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:30:52 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:30:52 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0277f16,6a952c4..9a449fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,9 +1,42 @@@
-2.2.7
+3.0.7
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
* Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
* Possible memory leak in NIODataInputStream (CASSANDRA-11867)
- * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
- * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+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)
+
+
+3.0.6
+ * Disallow creating view with a static column (CASSANDRA-11602)
+ * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
+ * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
+ * Fix queries with filtering on counter columns (CASSANDRA-11629)
+ * Improve tombstone printing in sstabledump (CASSANDRA-11655)
+ * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669)
+ * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
+ * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
+ * Ignore all LocalStrategy keyspaces for streaming and other related
+ operations (CASSANDRA-11627)
+ * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
+ * Only open one sstable scanner per sstable (CASSANDRA-11412)
+ * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
+ * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
* Produce a heap dump when exiting on OOM (CASSANDRA-9861)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
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/2bacc9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bacc9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bacc9a5
Branch: refs/heads/trunk
Commit: 2bacc9a5c7a6db3dba59e3039af05b403391cf09
Parents: 907c826 d27f9b0
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:28:01 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:28:01 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6750ab,8dfa02a..6a952c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.1.15
+2.2.7
+ * Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
+ * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
+ * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
+ * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
+ * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
+ * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
+ * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510)
+ * JSON datetime formatting needs timezone (CASSANDRA-11137)
+ * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
+ * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660)
+ * Add missing files to debian packages (CASSANDRA-11642)
+ * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
+ * cqlsh: COPY FROM should use regular inserts for single statement batches and
+ report errors correctly if workers processes crash on initialization (CASSANDRA-11474)
+ * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
+ * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
+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)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
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/2bacc9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bacc9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bacc9a5
Branch: refs/heads/cassandra-3.7
Commit: 2bacc9a5c7a6db3dba59e3039af05b403391cf09
Parents: 907c826 d27f9b0
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:28:01 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:28:01 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6750ab,8dfa02a..6a952c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.1.15
+2.2.7
+ * Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
+ * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
+ * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
+ * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
+ * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
+ * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
+ * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510)
+ * JSON datetime formatting needs timezone (CASSANDRA-11137)
+ * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
+ * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660)
+ * Add missing files to debian packages (CASSANDRA-11642)
+ * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
+ * cqlsh: COPY FROM should use regular inserts for single statement batches and
+ report errors correctly if workers processes crash on initialization (CASSANDRA-11474)
+ * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
+ * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
+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)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
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/2bacc9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bacc9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bacc9a5
Branch: refs/heads/cassandra-2.2
Commit: 2bacc9a5c7a6db3dba59e3039af05b403391cf09
Parents: 907c826 d27f9b0
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:28:01 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:28:01 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6750ab,8dfa02a..6a952c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.1.15
+2.2.7
+ * Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
+ * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
+ * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
+ * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
+ * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
+ * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
+ * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510)
+ * JSON datetime formatting needs timezone (CASSANDRA-11137)
+ * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
+ * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660)
+ * Add missing files to debian packages (CASSANDRA-11642)
+ * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
+ * cqlsh: COPY FROM should use regular inserts for single statement batches and
+ report errors correctly if workers processes crash on initialization (CASSANDRA-11474)
+ * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
+ * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
+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)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[03/15] cassandra git commit: Set default
streaming_socket_timeout_in_ms to 24 hours
Posted by yu...@apache.org.
Set default streaming_socket_timeout_in_ms to 24 hours
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11840
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d27f9b0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d27f9b0b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d27f9b0b
Branch: refs/heads/trunk
Commit: d27f9b0b772ba60fece3f3b1101ff63aabdad1fb
Parents: 6100eb2
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed May 18 12:40:01 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:26:51 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d914420..8dfa02a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
* Do not consider local node a valid source during replace (CASSANDRA-11848)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 90c5be4..7f2a6fa 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -635,10 +635,12 @@ request_timeout_in_ms: 10000
cross_node_timeout: false
# Set socket timeout for streaming operation.
-# The stream session is failed if no data is received by any of the
-# participants within that period.
-# Default value is 3600000, which means streams timeout after an hour.
-# streaming_socket_timeout_in_ms: 3600000
+# The stream session is failed if no data/ack is received by any of the participants
+# within that period, which means this should also be sufficient to stream a large
+# sstable or rebuild table indexes.
+# Default value is 86400000ms, which means stale streams timeout after 24 hours.
+# A value of zero means stream sockets should never time out.
+# streaming_socket_timeout_in_ms: 86400000
# phi value that must be reached for a host to be marked down.
# most users should never need to adjust this.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 9ff7096..2c5e36a 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -85,7 +85,7 @@ public class Config
public volatile Long truncate_request_timeout_in_ms = 60000L;
- public Integer streaming_socket_timeout_in_ms = 3600000;
+ public Integer streaming_socket_timeout_in_ms = 86400000; //24 hours
public boolean cross_node_timeout = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 642e837..4eb8557 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.streaming;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.SocketTimeoutException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -502,7 +503,17 @@ public class StreamSession implements IEndpointStateChangeSubscriber
*/
public void onError(Throwable e)
{
- logger.error("[Stream #{}] Streaming error occurred", planId(), 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);
+ }
// send session failure message
if (handler.isOutgoingConnected())
handler.sendMessage(new SessionFailedMessage());
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
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/2bacc9a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bacc9a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bacc9a5
Branch: refs/heads/cassandra-3.0
Commit: 2bacc9a5c7a6db3dba59e3039af05b403391cf09
Parents: 907c826 d27f9b0
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:28:01 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:28:01 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6750ab,8dfa02a..6a952c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.1.15
+2.2.7
+ * Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
+ * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
+ * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
+ * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
+ * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
+ * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
+ * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
+ * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510)
+ * JSON datetime formatting needs timezone (CASSANDRA-11137)
+ * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
+ * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660)
+ * Add missing files to debian packages (CASSANDRA-11642)
+ * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
+ * cqlsh: COPY FROM should use regular inserts for single statement batches and
+ report errors correctly if workers processes crash on initialization (CASSANDRA-11474)
+ * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
+ * Fix slice queries on ordered COMPACT tables (CASSANDRA-10988)
+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)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bacc9a5/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[15/15] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c8ee4c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c8ee4c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c8ee4c7
Branch: refs/heads/trunk
Commit: 9c8ee4c73f4e4e8d5b7693d34a0d6d6397418e90
Parents: 87def2e f39a352
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:35:27 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:35:27 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/9c8ee4c7/CHANGES.txt
----------------------------------------------------------------------
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/e000ebbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e000ebbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e000ebbe
Branch: refs/heads/trunk
Commit: e000ebbe50dafc502255bf5fb5dbfba24f90a8e5
Parents: ed84bbc 2bacc9a
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:30:52 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:30:52 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0277f16,6a952c4..9a449fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,9 +1,42 @@@
-2.2.7
+3.0.7
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
* Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
* Possible memory leak in NIODataInputStream (CASSANDRA-11867)
- * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
- * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+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)
+
+
+3.0.6
+ * Disallow creating view with a static column (CASSANDRA-11602)
+ * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
+ * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
+ * Fix queries with filtering on counter columns (CASSANDRA-11629)
+ * Improve tombstone printing in sstabledump (CASSANDRA-11655)
+ * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669)
+ * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
+ * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
+ * Ignore all LocalStrategy keyspaces for streaming and other related
+ operations (CASSANDRA-11627)
+ * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
+ * Only open one sstable scanner per sstable (CASSANDRA-11412)
+ * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
+ * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
* Produce a heap dump when exiting on OOM (CASSANDRA-9861)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[02/15] cassandra git commit: Set default
streaming_socket_timeout_in_ms to 24 hours
Posted by yu...@apache.org.
Set default streaming_socket_timeout_in_ms to 24 hours
Patch by Paulo Motta; reviewed by Yuki Morishita for CASSANDRA-11840
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d27f9b0b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d27f9b0b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d27f9b0b
Branch: refs/heads/cassandra-2.2
Commit: d27f9b0b772ba60fece3f3b1101ff63aabdad1fb
Parents: 6100eb2
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed May 18 12:40:01 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:26:51 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d914420..8dfa02a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
* Do not consider local node a valid source during replace (CASSANDRA-11848)
* Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
* Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 90c5be4..7f2a6fa 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -635,10 +635,12 @@ request_timeout_in_ms: 10000
cross_node_timeout: false
# Set socket timeout for streaming operation.
-# The stream session is failed if no data is received by any of the
-# participants within that period.
-# Default value is 3600000, which means streams timeout after an hour.
-# streaming_socket_timeout_in_ms: 3600000
+# The stream session is failed if no data/ack is received by any of the participants
+# within that period, which means this should also be sufficient to stream a large
+# sstable or rebuild table indexes.
+# Default value is 86400000ms, which means stale streams timeout after 24 hours.
+# A value of zero means stream sockets should never time out.
+# streaming_socket_timeout_in_ms: 86400000
# phi value that must be reached for a host to be marked down.
# most users should never need to adjust this.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 9ff7096..2c5e36a 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -85,7 +85,7 @@ public class Config
public volatile Long truncate_request_timeout_in_ms = 60000L;
- public Integer streaming_socket_timeout_in_ms = 3600000;
+ public Integer streaming_socket_timeout_in_ms = 86400000; //24 hours
public boolean cross_node_timeout = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d27f9b0b/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 642e837..4eb8557 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.streaming;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.SocketTimeoutException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -502,7 +503,17 @@ public class StreamSession implements IEndpointStateChangeSubscriber
*/
public void onError(Throwable e)
{
- logger.error("[Stream #{}] Streaming error occurred", planId(), 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);
+ }
// send session failure message
if (handler.isOutgoingConnected())
handler.sendMessage(new SessionFailedMessage());
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
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/e000ebbe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e000ebbe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e000ebbe
Branch: refs/heads/cassandra-3.0
Commit: e000ebbe50dafc502255bf5fb5dbfba24f90a8e5
Parents: ed84bbc 2bacc9a
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:30:52 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed May 25 19:30:52 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 10 ++++++----
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../org/apache/cassandra/streaming/StreamSession.java | 13 ++++++++++++-
4 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0277f16,6a952c4..9a449fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,9 +1,42 @@@
-2.2.7
+3.0.7
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
* Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
* Possible memory leak in NIODataInputStream (CASSANDRA-11867)
- * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
- * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
+ * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
+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)
+
+
+3.0.6
+ * Disallow creating view with a static column (CASSANDRA-11602)
+ * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
+ * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
+ * Fix queries with filtering on counter columns (CASSANDRA-11629)
+ * Improve tombstone printing in sstabledump (CASSANDRA-11655)
+ * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669)
+ * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
+ * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
+ * Ignore all LocalStrategy keyspaces for streaming and other related
+ operations (CASSANDRA-11627)
+ * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
+ * Only open one sstable scanner per sstable (CASSANDRA-11412)
+ * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
+ * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
+ * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)
+ * Notify indexers of expired rows during compaction (CASSANDRA-11329)
+ * Properly respond with ProtocolError when a v1/v2 native protocol
+ header is received (CASSANDRA-11464)
+ * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
+Merged from 2.2:
+ * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
* cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
* Exit JVM if JMX server fails to startup (CASSANDRA-11540)
* Produce a heap dump when exiting on OOM (CASSANDRA-9861)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e000ebbe/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by yu...@apache.org.
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 <yu...@apache.org>
Authored: Wed May 25 19:35:20 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
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());
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by yu...@apache.org.
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/trunk
Commit: f39a352fdfb6cb8adb49b7568d72b06ac8f90cf1
Parents: ecdbe3f e000ebb
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed May 25 19:35:20 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
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());