Author: mbautin Date: Thu Feb 2 19:41:28 2012 New Revision: 1239788 URL: http://svn.apache.org/viewvc?rev=1239788&view=rev Log: [master] Fix the wrong metrics name for GETSIZE and INCREMENT
Summary: It is supposed to generate the effective table name for the schema metrics. Tag as [master] since there is no need to fix this bug in the apache trunk. Test Plan: running all the unit tests and I will test it on the dev cluster Reviewers: kannan, mbautin Reviewed By: kannan CC: hbase-eng@lists Differential Revision: https://phabricator.fb.com/D395841 Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1239788&r1=1239787&r2=1239788&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Thu Feb 2 19:41:28 2012 @@ -3669,7 +3669,7 @@ public class HRegion implements HeapSize long after = EnvironmentEdgeManager.currentTimeMillis(); String signature = SchemaMetrics.generateSchemaMetricsPrefix( this.getTableDesc().getNameAsString(), Bytes.toString(family)); - HRegion.incrTimeVaryingMetric(signature + ".increment_", after - before); + HRegion.incrTimeVaryingMetric(signature + "increment_", after - before); if (flush) { // Request a cache flush. Do it outside update lock. Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=1239788&r1=1239787&r2=1239788&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original) +++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Thu Feb 2 19:41:28 2012 @@ -198,7 +198,7 @@ class StoreScanner extends NonLazyKeyVal String mutationSignature = SchemaMetrics.generateSchemaMetricsPrefix( tableName, family); - this.metricNameGetsize = mutationSignature + ".getsize"; + this.metricNameGetsize = mutationSignature + "getsize"; } /** 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=1239788&r1=1239787&r2=1239788&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 Feb 2 19:41:28 2012 @@ -529,13 +529,13 @@ public class SchemaMetrics { * @param cfName the column family name * @return schemaMetricsPrefix */ - public static String generateSchemaMetricsPrefix(final String tableName, + public static String generateSchemaMetricsPrefix(String tableName, final String cfName){ + tableName = getEffectiveTableName(tableName); String schemaMetricPrefix = tableName.equals(TOTAL_KEY) ? "" : TABLE_PREFIX + tableName + "."; schemaMetricPrefix += cfName.equals(TOTAL_KEY) ? "" : CF_PREFIX + cfName + "."; - return schemaMetricPrefix; }
