Repository: hbase Updated Branches: refs/heads/branch-1 6605f8f68 -> 78f526289
HBASE-16059 Region normalizer fails to trigger merge action where one of the regions is empty Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/78f52628 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/78f52628 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/78f52628 Branch: refs/heads/branch-1 Commit: 78f52628960547f4717621e0863456fe1af0cda6 Parents: 6605f8f Author: tedyu <yuzhih...@gmail.com> Authored: Mon Jun 20 11:24:33 2016 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Mon Jun 20 11:24:33 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/78f52628/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java index f57ded1..acf12b4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java @@ -170,7 +170,7 @@ public class SimpleRegionNormalizer implements RegionNormalizer { if (mergeEnabled) { HRegionInfo hri2 = tableRegions.get(candidateIdx+1); long regionSize2 = getRegionSize(hri2); - if (regionSize > 0 && regionSize2 > 0 && regionSize + regionSize2 < avgRegionSize) { + if (regionSize >= 0 && regionSize2 >= 0 && regionSize + regionSize2 < avgRegionSize) { LOG.info("Table " + table + ", small region size: " + regionSize + " plus its neighbor size: " + regionSize2 + ", less than the avg size " + avgRegionSize + ", merging them");
