You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/06/02 16:30:01 UTC
hbase git commit: HBASE-15933 Addendum - make merge decision when
sizes of both regions are known
Repository: hbase
Updated Branches:
refs/heads/branch-1 37bb8a5f6 -> 72dc6fe5d
HBASE-15933 Addendum - make merge decision when sizes of both regions are known
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72dc6fe5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72dc6fe5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72dc6fe5
Branch: refs/heads/branch-1
Commit: 72dc6fe5d531d55a3b09449396d2f04e7eb9c461
Parents: 37bb8a5
Author: tedyu <yu...@gmail.com>
Authored: Thu Jun 2 09:29:57 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Jun 2 09:29:57 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/72dc6fe5/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 a2202ad..f57ded1 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 + 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");