Repository: hbase Updated Branches: refs/heads/hbase-11339 30bc7d559 -> bd5b3e92d
HBASE-12540 TestRegionServerMetrics#testMobMetrics test failure (Jingcheng Du and Jiajia Li) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bd5b3e92 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd5b3e92 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd5b3e92 Branch: refs/heads/hbase-11339 Commit: bd5b3e92de37a8ff77d12e05131ba43eeb187a30 Parents: 30bc7d5 Author: Jonathan M Hsieh <[email protected]> Authored: Wed Dec 10 19:43:59 2014 -0800 Committer: Jonathan M Hsieh <[email protected]> Committed: Wed Dec 10 19:43:59 2014 -0800 ---------------------------------------------------------------------- .../hbase/regionserver/TestRegionServerMetrics.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/bd5b3e92/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java index c220cba..48eba8e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java @@ -384,7 +384,7 @@ public class TestRegionServerMetrics { byte[] cf = Bytes.toBytes("d"); byte[] qualifier = Bytes.toBytes("qual"); byte[] val = Bytes.toBytes("mobdata"); - int compactionThreshold = conf.getInt("hbase.hstore.compactionThreshold", 3); + int numHfiles = conf.getInt("hbase.hstore.compactionThreshold", 3) - 1; HTableDescriptor htd = new HTableDescriptor(tableName); HColumnDescriptor hcd = new HColumnDescriptor(cf); hcd.setMobEnabled(true); @@ -394,14 +394,14 @@ public class TestRegionServerMetrics { HTable t = TEST_UTIL.createTable(htd, new byte[0][0], conf); HRegion region = rs.getOnlineRegions(tableName).get(0); t.setAutoFlush(true, true); - for (int insertCount = 0; insertCount < compactionThreshold; insertCount++) { + for (int insertCount = 0; insertCount < numHfiles; insertCount++) { Put p = new Put(Bytes.toBytes(insertCount)); p.add(cf, qualifier, val); t.put(p); admin.flush(tableName); } metricsRegionServer.getRegionServerWrapper().forceRecompute(); - metricsHelper.assertCounter("mobFlushCount", compactionThreshold, serverSource); + metricsHelper.assertCounter("mobFlushCount", numHfiles, serverSource); Scan scan = new Scan(Bytes.toBytes(0), Bytes.toBytes(2)); ResultScanner scanner = t.getScanner(scan); scanner.next(100); @@ -412,7 +412,7 @@ public class TestRegionServerMetrics { region.initialize(); region.compactStores(true); metricsRegionServer.getRegionServerWrapper().forceRecompute(); - metricsHelper.assertCounter("mobCompactedFromMobCellsCount", compactionThreshold, + metricsHelper.assertCounter("mobCompactedFromMobCellsCount", numHfiles, serverSource); metricsHelper.assertCounter("mobCompactedIntoMobCellsCount", 0, serverSource); scanner = t.getScanner(scan); @@ -420,8 +420,8 @@ public class TestRegionServerMetrics { metricsRegionServer.getRegionServerWrapper().forceRecompute(); // metrics are reset by the region initialization metricsHelper.assertCounter("mobScanCellsCount", 0, serverSource); - for (int insertCount = compactionThreshold; - insertCount < 2 * compactionThreshold - 1; insertCount++) { + for (int insertCount = numHfiles; + insertCount < 2 * numHfiles - 1; insertCount++) { Put p = new Put(Bytes.toBytes(insertCount)); p.add(cf, qualifier, val); t.put(p); @@ -433,7 +433,7 @@ public class TestRegionServerMetrics { metricsRegionServer.getRegionServerWrapper().forceRecompute(); // metrics are reset by the region initialization metricsHelper.assertCounter("mobCompactedFromMobCellsCount", 0, serverSource); - metricsHelper.assertCounter("mobCompactedIntoMobCellsCount", 2 * compactionThreshold - 1, + metricsHelper.assertCounter("mobCompactedIntoMobCellsCount", 2 * numHfiles - 1, serverSource); t.close(); admin.close();
