Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C35D3188C1 for ; Wed, 17 Feb 2016 15:53:54 +0000 (UTC) Received: (qmail 1286 invoked by uid 500); 17 Feb 2016 15:53:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 1178 invoked by uid 500); 17 Feb 2016 15:53:54 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 995 invoked by uid 99); 17 Feb 2016 15:53:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Feb 2016 15:53:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4679E1120; Wed, 17 Feb 2016 15:53:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Wed, 17 Feb 2016 15:53:55 -0000 Message-Id: <4d1c997d6c5543ce86bc351227c93521@git.apache.org> In-Reply-To: <080ac7ff4f0e46f088e647c7e6e92a90@git.apache.org> References: <080ac7ff4f0e46f088e647c7e6e92a90@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/10] cassandra git commit: Fix sstableloader to unthrottle streaming by default 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-3.0 Commit: 434dfc97a72e5d3ab4350b87dba787e105a6805d Parents: f4b21f5 Author: Yuki Morishita Authored: Wed Feb 17 09:51:58 2016 -0600 Committer: Yuki Morishita 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;