From 9b63a35da6f6c6f8da2ca0e3808e7db0307fd393 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Tue, 8 Nov 2016 09:48:11 +0200 Subject: [PATCH] Implement deprecated metrics in CommitLog and CompactionManager Implement some deprecated metrics in CommitLog and CompactionManager, that can easily just be a wrapper to the non-deprecated metrics API. Message-Id: <1478591291-30344-1-git-send-email-penberg@scylladb.com> --- .../java/org/apache/cassandra/db/commitlog/CommitLog.java | 6 +++--- .../apache/cassandra/db/compaction/CompactionManager.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java index 784b8bb..d5c6689 100644 --- a/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/main/java/org/apache/cassandra/db/commitlog/CommitLog.java @@ -73,7 +73,7 @@ public class CommitLog implements CommitLogMBean { @Deprecated public long getCompletedTasks() { log(" getCompletedTasks()"); - return c.getLongValue(""); + return metrics.completedTasks.value(); } /** @@ -84,7 +84,7 @@ public class CommitLog implements CommitLogMBean { @Deprecated public long getPendingTasks() { log(" getPendingTasks()"); - return c.getLongValue(""); + return metrics.pendingTasks.value(); } /** @@ -95,7 +95,7 @@ public class CommitLog implements CommitLogMBean { @Deprecated public long getTotalCommitlogSize() { log(" getTotalCommitlogSize()"); - return c.getLongValue(""); + return metrics.totalCommitLogSize.value(); } /** diff --git a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java index 7cd95be..55c3a60 100644 --- a/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/main/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -117,7 +117,7 @@ public class CompactionManager implements CompactionManagerMBean { @Deprecated public int getPendingTasks() { log(" getPendingTasks()"); - return c.getIntValue(""); + return metrics.pendingTasks.value(); } /** @@ -127,7 +127,7 @@ public class CompactionManager implements CompactionManagerMBean { @Deprecated public long getCompletedTasks() { log(" getCompletedTasks()"); - return c.getLongValue(""); + return metrics.completedTasks.value(); } /** @@ -147,7 +147,7 @@ public class CompactionManager implements CompactionManagerMBean { @Deprecated public long getTotalCompactionsCompleted() { log(" getTotalCompactionsCompleted()"); - return c.getLongValue(""); + return metrics.totalCompactionsCompleted.count(); } /**