Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicMetrics.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicMetrics.java (revision 1374354) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicMetrics.java (working copy) @@ -64,6 +64,7 @@ LogFactory.getLog(RegionServerDynamicStatistics.class); private boolean reflectionInitialized = false; + private boolean needsUpdateMessage = false; private Field recordMetricMapField; private Field registryMetricMapField; @@ -102,14 +103,7 @@ MetricsLongValue m = (MetricsLongValue)registry.get(name); if (m == null) { m = new MetricsLongValue(name, this.registry); - try { - if (updateMbeanInfoIfMetricsListChanged != null) { - updateMbeanInfoIfMetricsListChanged.invoke(this.rsDynamicStatistics, - new Object[]{}); - } - } catch (Exception e) { - LOG.error(e); - } + this.needsUpdateMessage = true; } m.set(amt); } @@ -121,14 +115,7 @@ MetricsTimeVaryingRate m = (MetricsTimeVaryingRate)registry.get(name); if (m == null) { m = new MetricsTimeVaryingRate(name, this.registry); - try { - if (updateMbeanInfoIfMetricsListChanged != null) { - updateMbeanInfoIfMetricsListChanged.invoke(this.rsDynamicStatistics, - new Object[]{}); - } - } catch (Exception e) { - LOG.error(e); - } + this.needsUpdateMessage = true; } if (numOps > 0) { m.inc(numOps, amt); @@ -141,7 +128,7 @@ */ @SuppressWarnings("rawtypes") public void clear() { - + this.needsUpdateMessage = true; // If this is the first clear use reflection to get the two maps that hold copies of our // metrics on the hadoop metrics side. We have to use reflection because there is not // remove metrics on the hadoop side. If we can't get them then clearing old metrics @@ -212,6 +199,21 @@ value.getSecond().getAndSet(0)); } + // If there are new metrics sending this message to jmx tells it to update everything. + // This is not ideal we should just move to metrics2 that has full support for dynamic metrics. + if (needsUpdateMessage) { + try { + if (updateMbeanInfoIfMetricsListChanged != null) { + updateMbeanInfoIfMetricsListChanged.invoke(this.rsDynamicStatistics, + new Object[]{}); + } + } catch (Exception e) { + LOG.error(e); + } + needsUpdateMessage = false; + } + + synchronized (registry) { // Iterate through the registry to propagate the different rpc metrics. for (String metricName : registry.getKeyList() ) {