natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert metrics upgrade from stress. 

Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6153
This commit is contained in:
Brandon Williams 2013-10-08 13:37:36 -05:00
parent c8434acf75
commit a8a2ffb976
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/stress/src/org/apache/cassandra/stress/StressAction.java
View File

@ -140,9 +140,7 @@ public class StressAction extends Thread
total,
opDelta / interval,
keyDelta / interval,
StressStatistics.nanosToMillis(latency.getMedian()),
StressStatistics.nanosToMillis(latency.get95thPercentile()),
StressStatistics.nanosToMillis(latency.get999thPercentile()),
latency.getMedian(), latency.get95thPercentile(), latency.get999thPercentile(),
currentTimeInSeconds));
if (client.outputStatistics()) {

13
tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
View File

@ -19,7 +19,6 @@
package org.apache.cassandra.stress;
import java.io.PrintStream;
import org.apache.commons.lang3.time.DurationFormatUtils;
import com.yammer.metrics.stats.Snapshot;
@ -30,7 +29,6 @@ import com.yammer.metrics.stats.Snapshot;
*/
public class StressStatistics
{
private static final double NANOS_PER_MILLI = 1_000_000.0;
private Session client;
private PrintStream output;
@ -95,11 +93,11 @@ public class StressStatistics
tallyOpRateCount += 1;
tallyKeyRateSum += intervalKeyRate;
tallyKeyRateCount += 1;
tallyLatencySum += nanosToMillis(latency.getMedian());
tallyLatencySum += latency.getMedian();
tallyLatencyCount += 1;
tally95thLatencySum += nanosToMillis(latency.get95thPercentile());
tally95thLatencySum += latency.get95thPercentile();
tally95thLatencyCount += 1;
tally999thLatencySum += nanosToMillis(latency.get999thPercentile());
tally999thLatencySum += latency.get999thPercentile();
tally999thLatencyCount += 1;
}
durationInSeconds = currentTimeInSeconds;
@ -124,10 +122,5 @@ 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;
}
}