svn commit: r1227421 - in /hbase/branches/0.89-fb/src: main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java

[nspiegelberg]

Author: nspiegelberg
Date: Thu Jan  5 01:26:36 2012
New Revision: 1227421

URL: http://svn.apache.org/viewvc?rev=1227421&view=rev
Log:
[jira] [HBASE-5072] Support Max Value for Per-Store Metrics

Summary: We were bit in our multi-tenant cluster because one of our Stores
encountered a bug and grew its StoreFile count. We didn't notice this because
the StoreFile count currently reported by the RegionServer is an average of all
Stores in the region. For the per-Store metrics, we should also record the max
so we can notice outliers.

Test Plan:  - mvn test -Dtest=TestRegionServerMetrics

Reviewers: JIRA, mbautin, Kannan

Differential Revision: 945

Modified:
    
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
    
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java

Modified: 
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java?rev=1227421&r1=1227420&r2=1227421&view=diff
==============================================================================
--- 
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
 (original)
+++ 
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
 Thu Jan  5 01:26:36 2012
@@ -231,6 +231,7 @@ public class SchemaMetrics {
 
   private final String[] bloomMetricNames = new String[2];
   private final String[] storeMetricNames = new String[NUM_STORE_METRIC_TYPES];
+  private final String[] storeMetricNamesMax = new 
String[NUM_STORE_METRIC_TYPES];
 
   private SchemaMetrics(final String tableName, final String cfName) {
     String metricPrefix =
@@ -276,8 +277,9 @@ public class SchemaMetrics {
     }
 
     for (StoreMetricType storeMetric : StoreMetricType.values()) {
-      storeMetricNames[storeMetric.ordinal()] = metricPrefix +
-        storeMetric.toString();
+      String coreName = metricPrefix + storeMetric.toString();
+      storeMetricNames[storeMetric.ordinal()] = coreName;
+      storeMetricNamesMax[storeMetric.ordinal()] = coreName + ".max";
     }
   }
 
@@ -376,13 +378,22 @@ public class SchemaMetrics {
   public void accumulateStoreMetric(final Map<String, MutableDouble> tmpMap,
       StoreMetricType storeMetricType, double val) {
     final String key = getStoreMetricName(storeMetricType);
-    if (tmpMap.get(key) != null) {
-      tmpMap.get(key).add(val);
-    } else {
+    if (tmpMap.get(key) == null) {
       tmpMap.put(key, new MutableDouble(val));
+    } else {
+      tmpMap.get(key).add(val);
     }
 
-    if (this != ALL_SCHEMA_METRICS) {
+    if (this == ALL_SCHEMA_METRICS) {
+      // also compute the max value across all Stores on this server
+      final String maxKey = getStoreMetricNameMax(storeMetricType);
+      MutableDouble cur = tmpMap.get(maxKey);
+      if (cur == null) {
+        tmpMap.put(maxKey, new MutableDouble(val));
+      } else if (cur.doubleValue() < val) {
+        cur.setValue(val);
+      }
+    } else {
       ALL_SCHEMA_METRICS.accumulateStoreMetric(tmpMap, storeMetricType, val);
     }
   }
@@ -391,6 +402,10 @@ public class SchemaMetrics {
     return storeMetricNames[storeMetricType.ordinal()];
   }
 
+  public String getStoreMetricNameMax(StoreMetricType storeMetricType) {
+    return storeMetricNamesMax[storeMetricType.ordinal()];
+  }
+
   /**
    * Update a metric that does not get reset on every poll.
    * @param storeMetricType the store metric to update

Modified: 
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java?rev=1227421&r1=1227420&r2=1227421&view=diff
==============================================================================
--- 
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
 (original)
+++ 
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
 Thu Jan  5 01:26:36 2012
@@ -112,9 +112,15 @@ public class TestRegionServerMetrics {
 
     for (String cf : FAMILIES) {
       SchemaMetrics schemaMetrics = SchemaMetrics.getInstance(TABLE_NAME, cf);
-      assertStoreMetricEquals(NUM_FLUSHES * NUM_REGIONS,
-          schemaMetrics, StoreMetricType.STORE_FILE_COUNT);
+      assertStoreMetricEquals(NUM_FLUSHES * NUM_REGIONS, schemaMetrics,
+          StoreMetricType.STORE_FILE_COUNT);
     }
+
+    // ensure that the max value is also maintained
+    final String storeMetricName = ALL_METRICS
+        .getStoreMetricNameMax(StoreMetricType.STORE_FILE_COUNT);
+    assertEquals("Invalid value for store metric " + storeMetricName,
+        NUM_FLUSHES, HRegion.getNumericMetric(storeMetricName));
   }
 
 }