Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 f4b21f5ff -> 434dfc97a refs/heads/cassandra-2.2 97f3aa681 -> 78f46ded7 refs/heads/cassandra-3.0 fcc40e588 -> ee81b462b refs/heads/trunk 097ce3873 -> 9f322ac60
Fix sstableloader to unthrottle streaming by default patch by yukim; reviewed by marcuse for CASSANDRA-9714 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/434dfc97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/434dfc97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/434dfc97 Branch: refs/heads/cassandra-2.1 Commit: 434dfc97a72e5d3ab4350b87dba787e105a6805d Parents: f4b21f5 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Feb 17 09:51:58 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Feb 17 09:51:58 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/BulkLoader.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/434dfc97/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9a9c4f7..55f806c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.14 + * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714) * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176) * Properly release sstable ref when doing offline scrub (CASSANDRA-10697) * Improve nodetool status performance for large cluster (CASSANDRA-7238) http://git-wip-us.apache.org/repos/asf/cassandra/blob/434dfc97/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index 37317d5..0b1a1d4 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -528,6 +528,9 @@ public class BulkLoader else { config = new Config(); + // unthrottle stream by default + config.stream_throughput_outbound_megabits_per_sec = 0; + config.inter_dc_stream_throughput_outbound_megabits_per_sec = 0; } opts.storagePort = config.storage_port; opts.sslStoragePort = config.ssl_storage_port;