andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Support deprecated method in StorageProxy" from Amnon

Browse Source 
"This series adds latency related depricated methods to the storage
 proxy.

 The implmenetation mimic origin, in which the depricated methods calls
 the counters that replaces them."
This commit is contained in:
Pekka Enberg 2015-10-26 09:15:20 +02:00
commit dc76d2550e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/cassandra/metrics/ClientRequestMetrics.java
View File

@ -59,10 +59,10 @@ public class ClientRequestMetrics extends LatencyMetrics {
public ClientRequestMetrics(String url, String scope) {
super(url, "ClientRequest", scope);
timeouts = APIMetrics.newMeter(url + "timeouts",
timeouts = APIMetrics.newMeter(url + "/timeouts",
factory.createMetricName("Timeouts"), "timeouts",
TimeUnit.SECONDS);
unavailables = APIMetrics.newMeter(url + "unavailables",
unavailables = APIMetrics.newMeter(url + "/unavailables",
factory.createMetricName("Unavailables"), "unavailables",
TimeUnit.SECONDS);
}

22
src/main/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -55,15 +55,15 @@ public class StorageProxy implements StorageProxyMBean {
public static final String UNREACHABLE = "UNREACHABLE";
private static final ClientRequestMetrics readMetrics = new ClientRequestMetrics(
"storage_proxy/metrics/read/", "Read");
"storage_proxy/metrics/read", "Read");
private static final ClientRequestMetrics rangeMetrics = new ClientRequestMetrics(
"storage_proxy/metrics/range/", "RangeSlice");
"storage_proxy/metrics/range", "RangeSlice");
private static final ClientRequestMetrics writeMetrics = new ClientRequestMetrics(
"storage_proxy/metrics/write/", "Write");
"storage_proxy/metrics/write", "Write");
private static final CASClientRequestMetrics casWriteMetrics = new CASClientRequestMetrics(
"storage_proxy/metrics/cas_write/", "CASWrite");
"storage_proxy/metrics/cas_write", "CASWrite");
private static final CASClientRequestMetrics casReadMetrics = new CASClientRequestMetrics(
"storage_proxy/metrics/cas_read/", "CASRead");
"storage_proxy/metrics/cas_read", "CASRead");
private static final double CONCURRENT_SUBREQUESTS_MARGIN = 0.10;
@ -113,7 +113,7 @@ public class StorageProxy implements StorageProxyMBean {
@Deprecated
public long[] getTotalReadLatencyHistogramMicros() {
log(" getTotalReadLatencyHistogramMicros()");
return c.getLongArrValue("");
return readMetrics.totalLatencyHistogram.getBuckets(false);
}
/**
@ -122,7 +122,7 @@ public class StorageProxy implements StorageProxyMBean {
@Deprecated
public long[] getRecentReadLatencyHistogramMicros() {
log(" getRecentReadLatencyHistogramMicros()");
return c.getLongArrValue("");
return readMetrics.getRecentLatencyHistogram();
}
@Deprecated
@ -146,13 +146,13 @@ public class StorageProxy implements StorageProxyMBean {
@Deprecated
public long[] getTotalRangeLatencyHistogramMicros() {
log(" getTotalRangeLatencyHistogramMicros()");
return c.getLongArrValue("");
return rangeMetrics.totalLatencyHistogram.getBuckets(false);
}
@Deprecated
public long[] getRecentRangeLatencyHistogramMicros() {
log(" getRecentRangeLatencyHistogramMicros()");
return c.getLongArrValue("");
return rangeMetrics.getRecentLatencyHistogram();
}
@Deprecated
@ -176,13 +176,13 @@ public class StorageProxy implements StorageProxyMBean {
@Deprecated
public long[] getTotalWriteLatencyHistogramMicros() {
log(" getTotalWriteLatencyHistogramMicros()");
return c.getLongArrValue("");
return writeMetrics.totalLatencyHistogram.getBuckets(false);
}
@Deprecated
public long[] getRecentWriteLatencyHistogramMicros() {
log(" getRecentWriteLatencyHistogramMicros()");
return c.getLongArrValue("");
return writeMetrics.getRecentLatencyHistogram();
}
public long getTotalHints() {