You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by la...@apache.org on 2012/08/25 06:41:12 UTC

svn commit: r1377210 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java

Author: larsh
Date: Sat Aug 25 04:41:12 2012
New Revision: 1377210

URL: http://svn.apache.org/viewvc?rev=1377210&view=rev
Log:
HBASE-6514 unknown metrics type: org.apache.hadoop.hbase.metrics.histogram.MetricsHistogram (Elliot Clark)

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java?rev=1377210&r1=1377209&r2=1377210&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/metrics/MetricsMBeanBase.java Sat Aug 25 04:41:12 2012
@@ -75,7 +75,8 @@ public class MetricsMBeanBase extends Me
   private static MetricsRegistry copyMinusHBaseMetrics(final MetricsRegistry mr) {
     MetricsRegistry copy = new MetricsRegistry();
     for (MetricsBase metric : mr.getMetricsList()) {
-      if (metric instanceof MetricsRate || metric instanceof MetricsString) {
+      if (metric instanceof MetricsRate || metric instanceof MetricsString ||
+          metric instanceof MetricsHistogram || metric instanceof ExactCounterMetric) {
         continue;
       }
       copy.add(metric.getName(), metric);