You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/02/25 17:59:27 UTC
[1/6] cassandra git commit: Fix streaming throttle unit to bits
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 ee160a971 -> da9f030c2
refs/heads/cassandra-2.1 ca6360704 -> 3b3570c8c
refs/heads/trunk 4807f1295 -> 7f8a09840
Fix streaming throttle unit to bits
patch by Björn Hegerfors; reviewed by yukim for CASSANDRA-8852
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da9f030c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da9f030c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da9f030c
Branch: refs/heads/cassandra-2.0
Commit: da9f030c2912748349d1874a544b97b9f08642d1
Parents: ee160a9
Author: Björn Hegerfors <bj...@kth.se>
Authored: Wed Feb 25 08:50:37 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 25 08:52:14 2015 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/da9f030c/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 b5b1c7f..4871078 100644
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@ -63,17 +63,17 @@ public class StreamManager implements StreamManagerMBean
public static class StreamRateLimiter
{
- private static final double ONE_MEGA_BIT = 1024 * 1024 * 8;
+ private static final double BYTES_PER_MEGABIT = 1024 * 1024 / 8;
private static final RateLimiter limiter = RateLimiter.create(Double.MAX_VALUE);
private static final RateLimiter interDCLimiter = RateLimiter.create(Double.MAX_VALUE);
private final boolean isLocalDC;
public StreamRateLimiter(InetAddress peer)
{
- double throughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BIT;
+ double throughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT;
mayUpdateThroughput(throughput, limiter);
- double interDCThroughput = ((double) DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BIT;
+ double interDCThroughput = ((double) DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT;
mayUpdateThroughput(interDCThroughput, interDCLimiter);
if (DatabaseDescriptor.getLocalDataCenter() != null && DatabaseDescriptor.getEndpointSnitch() != null)
[2/6] cassandra git commit: Fix streaming throttle unit to bits
Posted by yu...@apache.org.
Fix streaming throttle unit to bits
patch by Björn Hegerfors; reviewed by yukim for CASSANDRA-8852
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da9f030c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da9f030c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da9f030c
Branch: refs/heads/cassandra-2.1
Commit: da9f030c2912748349d1874a544b97b9f08642d1
Parents: ee160a9
Author: Björn Hegerfors <bj...@kth.se>
Authored: Wed Feb 25 08:50:37 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 25 08:52:14 2015 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/da9f030c/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 b5b1c7f..4871078 100644
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@ -63,17 +63,17 @@ public class StreamManager implements StreamManagerMBean
public static class StreamRateLimiter
{
- private static final double ONE_MEGA_BIT = 1024 * 1024 * 8;
+ private static final double BYTES_PER_MEGABIT = 1024 * 1024 / 8;
private static final RateLimiter limiter = RateLimiter.create(Double.MAX_VALUE);
private static final RateLimiter interDCLimiter = RateLimiter.create(Double.MAX_VALUE);
private final boolean isLocalDC;
public StreamRateLimiter(InetAddress peer)
{
- double throughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BIT;
+ double throughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT;
mayUpdateThroughput(throughput, limiter);
- double interDCThroughput = ((double) DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BIT;
+ double interDCThroughput = ((double) DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT;
mayUpdateThroughput(interDCThroughput, interDCLimiter);
if (DatabaseDescriptor.getLocalDataCenter() != null && DatabaseDescriptor.getEndpointSnitch() != null)
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b3570c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b3570c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b3570c8
Branch: refs/heads/trunk
Commit: 3b3570c8ca02031d2e3ef1687356bfc7d211bbb7
Parents: ca63607 da9f030
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Feb 25 08:57:37 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 25 08:57:37 2015 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b3570c8/src/java/org/apache/cassandra/streaming/StreamManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/StreamManager.java
index f40be99,4871078..728631d
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@@ -63,7 -63,7 +63,7 @@@ public class StreamManager implements S
public static class StreamRateLimiter
{
- private static final double ONE_MEGA_BIT = (1024 * 1024) / 8; // from bits
- private static final double BYTES_PER_MEGABIT = 1024 * 1024 / 8;
++ private static final double BYTES_PER_MEGABIT = (1024 * 1024) / 8; // from bits
private static final RateLimiter limiter = RateLimiter.create(Double.MAX_VALUE);
private static final RateLimiter interDCLimiter = RateLimiter.create(Double.MAX_VALUE);
private final boolean isLocalDC;
[3/6] cassandra git commit: Fix streaming throttle unit to bits
Posted by yu...@apache.org.
Fix streaming throttle unit to bits
patch by Björn Hegerfors; reviewed by yukim for CASSANDRA-8852
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da9f030c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da9f030c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da9f030c
Branch: refs/heads/trunk
Commit: da9f030c2912748349d1874a544b97b9f08642d1
Parents: ee160a9
Author: Björn Hegerfors <bj...@kth.se>
Authored: Wed Feb 25 08:50:37 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 25 08:52:14 2015 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/da9f030c/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 b5b1c7f..4871078 100644
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@ -63,17 +63,17 @@ public class StreamManager implements StreamManagerMBean
public static class StreamRateLimiter
{
- private static final double ONE_MEGA_BIT = 1024 * 1024 * 8;
+ private static final double BYTES_PER_MEGABIT = 1024 * 1024 / 8;
private static final RateLimiter limiter = RateLimiter.create(Double.MAX_VALUE);
private static final RateLimiter interDCLimiter = RateLimiter.create(Double.MAX_VALUE);
private final boolean isLocalDC;
public StreamRateLimiter(InetAddress peer)
{
- double throughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BIT;
+ double throughput = ((double) DatabaseDescriptor.getStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT;
mayUpdateThroughput(throughput, limiter);
- double interDCThroughput = ((double) DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) * ONE_MEGA_BIT;
+ double interDCThroughput = ((double) DatabaseDescriptor.getInterDCStreamThroughputOutboundMegabitsPerSec()) * BYTES_PER_MEGABIT;
mayUpdateThroughput(interDCThroughput, interDCLimiter);
if (DatabaseDescriptor.getLocalDataCenter() != null && DatabaseDescriptor.getEndpointSnitch() != null)
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f8a0984
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f8a0984
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f8a0984
Branch: refs/heads/trunk
Commit: 7f8a098403692e18f77e3173f7d92537dd842de4
Parents: 4807f12 3b3570c8
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Feb 25 08:59:02 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 25 08:59:02 2015 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b3570c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b3570c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b3570c8
Branch: refs/heads/cassandra-2.1
Commit: 3b3570c8ca02031d2e3ef1687356bfc7d211bbb7
Parents: ca63607 da9f030
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Feb 25 08:57:37 2015 -0800
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Feb 25 08:57:37 2015 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b3570c8/src/java/org/apache/cassandra/streaming/StreamManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/StreamManager.java
index f40be99,4871078..728631d
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@@ -63,7 -63,7 +63,7 @@@ public class StreamManager implements S
public static class StreamRateLimiter
{
- private static final double ONE_MEGA_BIT = (1024 * 1024) / 8; // from bits
- private static final double BYTES_PER_MEGABIT = 1024 * 1024 / 8;
++ private static final double BYTES_PER_MEGABIT = (1024 * 1024) / 8; // from bits
private static final RateLimiter limiter = RateLimiter.create(Double.MAX_VALUE);
private static final RateLimiter interDCLimiter = RateLimiter.create(Double.MAX_VALUE);
private final boolean isLocalDC;