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

ColumnFamilyStore: Use the combine API with metrics

Browse Source 
The column family store API was changed so it would have a single API to
return the snapshot size.

This changes the JMX to use the same API regardless if it is called from
the ColumnFamilyMetrics or from ColumnFamilyStore.

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
This commit is contained in:
Amnon Heiman 2015-12-02 12:52:24 +02:00 committed by Pekka Enberg
parent c6fc4e8340
commit e194ca85a4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -691,7 +691,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean {
*/
public long trueSnapshotsSize() {
log(" trueSnapshotsSize()");
return c.getLongValue("column_family/snapshots_size/" + getCFName());
return c.getLongValue("column_family/metrics/snapshots_size/" + getCFName());
}
public String getKeyspace() {

2
src/main/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
View File

@ -348,7 +348,7 @@ public class ColumnFamilyMetrics {
TimeUnit.MICROSECONDS, TimeUnit.SECONDS);
trueSnapshotsSize = createColumnFamilyGauge(
"/column_family/metrics/true_snapshots_size", "SnapshotsSize");
"/column_family/metrics/snapshots_size", "SnapshotsSize");
rowCacheHitOutOfRange = createColumnFamilyCounter(
"/column_family/metrics/row_cache_hit_out_of_range",
"RowCacheHitOutOfRange");