Repository: cassandra Updated Branches: refs/heads/trunk 9baf92af2 -> ca75b97e5
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/ca75b97e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca75b97e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca75b97e Branch: refs/heads/trunk Commit: ca75b97e59b56768741f7ba0a7f2ff206588c573 Parents: 28d8216 Author: Brandon Williams <[email protected]> Authored: Thu Apr 3 18:30:43 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Apr 3 18:31:39 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/ca75b97e/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);
