Repository: hbase Updated Branches: refs/heads/branch-2 fb54152e8 -> 966e3751c
HBASE-21097 Flush pressure assertion may fail in testFlushThroughputTuning Amending-Author: Duo Zhang <[email protected]> Signed-off-by: Duo Zhang <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/966e3751 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/966e3751 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/966e3751 Branch: refs/heads/branch-2 Commit: 966e3751c28affa66361b5881917536b446643e3 Parents: fb54152 Author: Ted Yu <[email protected]> Authored: Sat Sep 15 18:19:36 2018 +0800 Committer: zhangduo <[email protected]> Committed: Sat Sep 15 18:36:33 2018 +0800 ---------------------------------------------------------------------- .../throttle/TestFlushWithThroughputController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/966e3751/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java index 61f9cd4..7aaa153 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java @@ -177,12 +177,18 @@ public class TestFlushWithThroughputController { .build()); hbtu.waitTableAvailable(tableName); HRegionServer regionServer = hbtu.getRSForFirstRegionInTable(tableName); + double pressure = regionServer.getFlushPressure(); + LOG.debug("Flush pressure before flushing: " + pressure); PressureAwareFlushThroughputController throughputController = (PressureAwareFlushThroughputController) regionServer.getFlushThroughputController(); for (HRegion region : regionServer.getRegions()) { region.flush(true); } - assertEquals(0.0, regionServer.getFlushPressure(), EPSILON); + // We used to assert that the flush pressure is zero but after HBASE-15787 or HBASE-18294 we + // changed to use heapSize instead of dataSize to calculate the flush pressure, and since + // heapSize will never be zero, so flush pressure will never be zero either. So we changed the + // assertion here. + assertTrue(regionServer.getFlushPressure() < pressure); Thread.sleep(5000); boolean tablesOnMaster = LoadBalancer.isTablesOnMaster(hbtu.getConfiguration()); if (tablesOnMaster) {
