Author: liyin Date: Wed Apr 23 18:18:25 2014 New Revision: 1589481 URL: http://svn.apache.org/r1589481 Log: [Master] Fix TestRegionServerMetrics.testMultipleRegions
Author: adela Summary: we have been calculating the number of expected files wrongly - so I am not sure when this test actually started failing. Problem is that we caluclate only two files for META and ROOT. Since meta has two column families (historian and info) the total should be 3. Test Plan: here is a proof: https://phabricator.fb.com/P9319302 listing all possible files Reviewers: daviddeng, liyintang, manukranthk, elliott Reviewed By: daviddeng CC: hbase-eng@ Differential Revision: https://phabricator.fb.com/D1290838 Task ID: 4195255 Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java 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=1589481&r1=1589480&r2=1589481&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 Wed Apr 23 18:18:25 2014 @@ -123,7 +123,10 @@ public class TestRegionServerMetrics { } assertStoreMetricEquals(NUM_FLUSHES * NUM_REGIONS * FAMILIES.length - + META_AND_ROOT, ALL_METRICS, StoreMetricType.STORE_FILE_COUNT); + + 1 /*colfamily historian in META*/ + + 1 /*colfamily info in META*/ + + 1 /*ROOT */, + ALL_METRICS, StoreMetricType.STORE_FILE_COUNT); for (String cf : FAMILIES) { SchemaMetrics schemaMetrics = SchemaMetrics.getInstance(TABLE_NAME, cf);
