Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d3691cb4c -> c1740a213
Change streaming_socket_timeout_in_ms default patch by Robert Coli; reviewed by Benjamin Lerer for CASSANDRA-8611 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7e1ea4c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e1ea4c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e1ea4c8 Branch: refs/heads/cassandra-3.0 Commit: 7e1ea4c8c1af0809b990c27648edbff2efb2434a Parents: 15293a7 Author: Robert Coli <robert.d.a.c...@gmail.com> Authored: Wed Aug 26 15:16:47 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Wed Aug 26 15:16:47 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 4 ++-- src/java/org/apache/cassandra/config/Config.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e1ea4c8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2e3fb7d..26dc34b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.10 + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611) * (cqlsh) update list of CQL keywords (CASSANDRA-9232) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e1ea4c8/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index a3e54e5..4e0111d 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -633,8 +633,8 @@ cross_node_timeout: false # When a timeout occurs during streaming, streaming is retried from the start # of the current file. This _can_ involve re-streaming an important amount of # data, so you should avoid setting the value too low. -# Default value is 0, which never timeout streams. -# streaming_socket_timeout_in_ms: 0 +# Default value is 3600000, which means streams timeout after an hour. +# streaming_socket_timeout_in_ms: 3600000 # 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/7e1ea4c8/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 fec6a70..d960463 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 = 0; + public Integer streaming_socket_timeout_in_ms = 3600000; public boolean cross_node_timeout = false;
