Updated Branches:
  refs/heads/trunk 7263584c4 -> 458bcf238

Fix releasing CF metrics

patch by Russell Spitzer; reviewed by Aleksey Yeschenko


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c86f362
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c86f362
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c86f362

Branch: refs/heads/trunk
Commit: 5c86f362165e81759fd0c5cfcb70025fc286398b
Parents: 9d837e5
Author: Russell Spitzer <[email protected]>
Authored: Sat Jan 11 07:44:19 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Sat Jan 11 07:46:47 2014 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c86f362/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java 
b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index 30f01de..9be1650 100644
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@ -333,6 +333,7 @@ public class ColumnFamilyMetrics
     {
         readLatency.release();
         writeLatency.release();
+        
Metrics.defaultRegistry().removeMetric(factory.createMetricName("AllMemtablesDataSize"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableColumnsCount"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableDataSize"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("MemtableSwitchCount"));
@@ -353,7 +354,7 @@ public class ColumnFamilyMetrics
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("RecentBloomFilterFalseRatio"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("BloomFilterDiskSpaceUsed"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("KeyCacheHitRate"));
-        
Metrics.defaultRegistry().removeMetric(factory.createMetricName("SpeculativeRetry"));
+        
Metrics.defaultRegistry().removeMetric(factory.createMetricName("SpeculativeRetries"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("TombstoneScannedHistogram"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("LiveScannedHistogram"));
         
Metrics.defaultRegistry().removeMetric(factory.createMetricName("CoordinatorReadLatency"));

Reply via email to