Updated Branches: refs/heads/trunk 6da81cd5c -> 5dabd1cc0
fix latency displays caused by metrics-core now using nanoseconds Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5dabd1cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dabd1cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dabd1cc Branch: refs/heads/trunk Commit: 5dabd1cc0c65b329ff518d7ad3f09e4c11494f18 Parents: 6da81cd Author: Dave Brosius <[email protected]> Authored: Fri Aug 16 08:37:39 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Aug 16 08:37:39 2013 -0400 ---------------------------------------------------------------------- .../src/org/apache/cassandra/stress/StressAction.java | 4 +++- .../org/apache/cassandra/stress/StressStatistics.java | 14 +++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dabd1cc/tools/stress/src/org/apache/cassandra/stress/StressAction.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java index 1ad49f3..6b99001 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java @@ -140,7 +140,9 @@ public class StressAction extends Thread total, opDelta / interval, keyDelta / interval, - latency.getMedian(), latency.get95thPercentile(), latency.get999thPercentile(), + StressStatistics.nanosToMillis(latency.getMedian()), + StressStatistics.nanosToMillis(latency.get95thPercentile()), + StressStatistics.nanosToMillis(latency.get999thPercentile()), currentTimeInSeconds)); if (client.outputStatistics()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dabd1cc/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java b/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java index d448de7..aa0dcca 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java @@ -19,7 +19,9 @@ package org.apache.cassandra.stress; import com.codahale.metrics.Snapshot; + import java.io.PrintStream; + import org.apache.commons.lang.time.DurationFormatUtils; /** @@ -27,6 +29,7 @@ import org.apache.commons.lang.time.DurationFormatUtils; */ public class StressStatistics { + private static final double NANOS_PER_MILLI = 1_000_000.0; private Session client; private PrintStream output; @@ -91,11 +94,11 @@ public class StressStatistics tallyOpRateCount += 1; tallyKeyRateSum += intervalKeyRate; tallyKeyRateCount += 1; - tallyLatencySum += latency.getMedian(); + tallyLatencySum += nanosToMillis(latency.getMedian()); tallyLatencyCount += 1; - tally95thLatencySum += latency.get95thPercentile(); + tally95thLatencySum += nanosToMillis(latency.get95thPercentile()); tally95thLatencyCount += 1; - tally999thLatencySum += latency.get999thPercentile(); + tally999thLatencySum += nanosToMillis(latency.get999thPercentile()); tally999thLatencyCount += 1; } durationInSeconds = currentTimeInSeconds; @@ -120,5 +123,10 @@ public class StressStatistics output.println("Total operation time : " + DurationFormatUtils.formatDuration( durationInSeconds*1000, "HH:mm:ss", true)); } + + public static double nanosToMillis(double nanos) + { + return nanos / NANOS_PER_MILLI; + } }
