You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2014/02/15 22:58:27 UTC
[1/2] git commit: update the streaming throttle bytes to bits
Repository: cassandra
Updated Branches:
refs/heads/trunk 94bda1f7d -> e9d27781c
update the streaming throttle bytes to bits
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b041a933
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b041a933
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b041a933
Branch: refs/heads/trunk
Commit: b041a9339d5dd79e81054554c6c32e35a46241cd
Parents: bbc56eb
Author: vparthasarathy <vi...@gmail.com>
Authored: Sat Feb 15 13:51:56 2014 -0800
Committer: vparthasarathy <vi...@gmail.com>
Committed: Sat Feb 15 13:51:56 2014 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b041a933/src/java/org/apache/cassandra/streaming/StreamManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamManager.java b/src/java/org/apache/cassandra/streaming/StreamManager.java
index ccd0053..18cd28b 100644
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@ -59,7 +59,7 @@ public class StreamManager implements StreamManagerMBean
*/
public static RateLimiter getRateLimiter()
{
- double currentThroughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * 1024 * 1024;
+ double currentThroughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * 1024 * 1024 * 8;
// if throughput is set to 0, throttling is disabled
if (currentThroughput == 0)
currentThroughput = Double.MAX_VALUE;
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by vi...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/streaming/StreamManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9d27781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9d27781
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9d27781
Branch: refs/heads/trunk
Commit: e9d27781c58251d5a59c542116aa8f41e0feda80
Parents: 94bda1f b041a93
Author: vparthasarathy <vi...@gmail.com>
Authored: Sat Feb 15 13:58:11 2014 -0800
Committer: vparthasarathy <vi...@gmail.com>
Committed: Sat Feb 15 13:58:11 2014 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------