This is an automated email from the ASF dual-hosted git repository. zghao pushed a commit to branch branch-2 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push: new bd2dd21 HBASE-25077: hbck.jsp page loading fails, logs NPE in master log. (#2433) bd2dd21 is described below commit bd2dd21e4806b534122b3739543984e16eabcdfa Author: Mohammad Arshad <ars...@apache.org> AuthorDate: Sun Sep 27 11:35:38 2020 +0530 HBASE-25077: hbck.jsp page loading fails, logs NPE in master log. (#2433) Signed-off-by: Duo Zhang <zhang...@apache.org> Signed-off-by: Viraj Jasani <vjas...@apache.org> Signed-off-by: Pankaj Kumar<pankajku...@apache.org> --- .../src/main/java/org/apache/hadoop/hbase/master/HbckChore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java index 5f04c84..63fb5dd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HbckChore.java @@ -255,10 +255,10 @@ public class HbckChore extends ScheduledChore { for (Map.Entry<String, HbckRegionInfo> entry : regionInfoMap.entrySet()) { HbckRegionInfo hri = entry.getValue(); ServerName locationInMeta = hri.getMetaEntry().getRegionServer(); + if (locationInMeta == null) { + continue; + } if (hri.getDeployedOn().size() == 0) { - if (locationInMeta == null) { - continue; - } // skip the offline region which belong to disabled table. if (disabledTableRegions.contains(hri.getRegionNameAsString())) { continue;