You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/04 01:35:08 UTC
[1/5] git commit: Revert "Fix LatencyMetrics returning infinity."
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 ab99b8e75 -> 4b09b8deb
refs/heads/cassandra-2.1 d71b59e67 -> 6d901f90a
Revert "Fix LatencyMetrics returning infinity."
This reverts commit 5e51aa4e6d1d868bb82a1aa2ffaed4613b24ffc1.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc895172
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc895172
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc895172
Branch: refs/heads/cassandra-2.0
Commit: bc8951726e4830e6b9248b4417570f3363ff5eed
Parents: ab99b8e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 18:29:58 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 18:29:58 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc895172/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index ef1dee9..b53449c 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -85,11 +85,8 @@ public class LatencyMetrics
public void addNano(long nanos)
{
// convert to microseconds. 1 millionth
- synchronized (this)
- {
- latency.update(nanos, TimeUnit.NANOSECONDS);
- totalLatency.inc(nanos / 1000);
- }
+ latency.update(nanos, TimeUnit.NANOSECONDS);
+ totalLatency.inc(nanos / 1000);
totalLatencyHistogram.add(nanos / 1000);
recentLatencyHistogram.add(nanos / 1000);
}
@@ -103,13 +100,8 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = 0;
- long n = 0;
- synchronized (this)
- {
- ops = latency.count();
- n = totalLatency.count();
- }
+ long ops = latency.count();
+ long n = totalLatency.count();
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[2/5] git commit: Revert "Fix LatencyMetrics returning infinity."
Posted by br...@apache.org.
Revert "Fix LatencyMetrics returning infinity."
This reverts commit 5e51aa4e6d1d868bb82a1aa2ffaed4613b24ffc1.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc895172
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc895172
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc895172
Branch: refs/heads/cassandra-2.1
Commit: bc8951726e4830e6b9248b4417570f3363ff5eed
Parents: ab99b8e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 18:29:58 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 18:29:58 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/metrics/LatencyMetrics.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc895172/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index ef1dee9..b53449c 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -85,11 +85,8 @@ public class LatencyMetrics
public void addNano(long nanos)
{
// convert to microseconds. 1 millionth
- synchronized (this)
- {
- latency.update(nanos, TimeUnit.NANOSECONDS);
- totalLatency.inc(nanos / 1000);
- }
+ latency.update(nanos, TimeUnit.NANOSECONDS);
+ totalLatency.inc(nanos / 1000);
totalLatencyHistogram.add(nanos / 1000);
recentLatencyHistogram.add(nanos / 1000);
}
@@ -103,13 +100,8 @@ public class LatencyMetrics
@Deprecated
public double getRecentLatency()
{
- long ops = 0;
- long n = 0;
- synchronized (this)
- {
- ops = latency.count();
- n = totalLatency.count();
- }
+ long ops = latency.count();
+ long n = totalLatency.count();
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[3/5] git commit: getRecentLatency returns zero instead of infinity
Posted by br...@apache.org.
getRecentLatency returns zero instead of infinity
Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b09b8de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b09b8de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b09b8de
Branch: refs/heads/cassandra-2.1
Commit: 4b09b8deb33bd87d0714797e2e862221bd8735ab
Parents: bc89517
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 18:30:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 18:30:43 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/LatencyMetrics.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b09b8de/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index b53449c..b456e2a 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -98,10 +98,12 @@ public class LatencyMetrics
}
@Deprecated
- public double getRecentLatency()
+ public synchronized double getRecentLatency()
{
long ops = latency.count();
long n = totalLatency.count();
+ if (ops == lastOpCount)
+ return 0;
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);
[5/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@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/6d901f90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d901f90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d901f90
Branch: refs/heads/cassandra-2.1
Commit: 6d901f90a33a8e6682512ed6c1f66caf62b3da3d
Parents: d71b59e 4b09b8d
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 18:31:15 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 18:31:15 2014 -0500
----------------------------------------------------------------------
.../cassandra/metrics/LatencyMetrics.java | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[4/5] git commit: getRecentLatency returns zero instead of infinity
Posted by br...@apache.org.
getRecentLatency returns zero instead of infinity
Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-6920
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b09b8de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b09b8de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b09b8de
Branch: refs/heads/cassandra-2.0
Commit: 4b09b8deb33bd87d0714797e2e862221bd8735ab
Parents: bc89517
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 18:30:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 18:30:43 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/metrics/LatencyMetrics.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b09b8de/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
index b53449c..b456e2a 100644
--- a/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/LatencyMetrics.java
@@ -98,10 +98,12 @@ public class LatencyMetrics
}
@Deprecated
- public double getRecentLatency()
+ public synchronized double getRecentLatency()
{
long ops = latency.count();
long n = totalLatency.count();
+ if (ops == lastOpCount)
+ return 0;
try
{
return ((double) n - lastLatency) / (ops - lastOpCount);