You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/03/24 07:42:46 UTC
[2/5] git commit: Change default stream throughput from 400 to 200
mbps patch by Alexey Zotov; reviewed by Marcus Eriksson for CASSANDRA-5036
Change default stream throughput from 400 to 200 mbps
patch by Alexey Zotov; reviewed by Marcus Eriksson for CASSANDRA-5036
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f186117
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f186117
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f186117
Branch: refs/heads/trunk
Commit: 9f18611775fc6c277ec1521d0bcd084bda4498ef
Parents: 0d51a54
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Mar 24 01:38:37 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Mar 24 01:41:59 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 4 ++--
src/java/org/apache/cassandra/config/Config.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 3 ---
4 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f186117/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c9bc5d7..945b64d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.4
+ * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
* Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
* Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
* Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f186117/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 178487d..76e5901 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -477,8 +477,8 @@ compaction_preheat_key_cache: true
# given total throughput in Mbps. This is necessary because Cassandra does
# mostly sequential IO when streaming data during bootstrap or repair, which
# can lead to saturating the network connection and degrading rpc performance.
-# When unset, the default is 400 Mbps or 50 MB/s.
-# stream_throughput_outbound_megabits_per_sec: 400
+# When unset, the default is 200 Mbps or 25 MB/s.
+# stream_throughput_outbound_megabits_per_sec: 200
# How long the coordinator should wait for read operations to complete
read_request_timeout_in_ms: 10000
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f186117/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 212147a..780eaac 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -110,7 +110,7 @@ public class Config
public Integer max_streaming_retries = 3;
- public volatile Integer stream_throughput_outbound_megabits_per_sec;
+ public volatile Integer stream_throughput_outbound_megabits_per_sec = 200;
public String[] data_file_directories;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f186117/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 5fcef07..bf793be 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -410,9 +410,6 @@ public class DatabaseDescriptor
if (conf.compaction_throughput_mb_per_sec == null)
conf.compaction_throughput_mb_per_sec = 16;
- if (conf.stream_throughput_outbound_megabits_per_sec == null)
- conf.stream_throughput_outbound_megabits_per_sec = 400;
-
if (conf.rpc_min_threads == null)
conf.rpc_min_threads = 16;