[hbase] branch branch-2.3 updated: HBASE-25980 Master table.jsp pointed at meta throws 500 when no all r… (#3373)

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.3 by this push:
     new 14e7969  HBASE-25980 Master table.jsp pointed at meta throws 500 when 
no all r… (#3373)
14e7969 is described below

commit 14e79696cad80d1120c4ea20045e0e3b49676c18
Author: GeorryHuang <215175...@qq.com>
AuthorDate: Sun Jun 27 22:30:46 2021 +0800

    HBASE-25980 Master table.jsp pointed at meta throws 500 when no all r… 
(#3373)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
---
 .../main/resources/hbase-webapps/master/table.jsp  | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp 
b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index 87667e0..f243db8 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -60,7 +60,8 @@
   import="org.apache.hadoop.hbase.master.webapp.MetaBrowser"
   import="org.apache.hadoop.hbase.master.webapp.RegionReplicaInfo"
   import="org.apache.hadoop.hbase.quotas.QuotaSettingsFactory"
-  import="org.apache.hadoop.hbase.quotas.QuotaTableUtil"%>
+  import="org.apache.hadoop.hbase.quotas.QuotaTableUtil"
+  import="org.apache.hadoop.hbase.NotAllMetaRegionsOnlineException" %>
 <%@ page import="org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot" %>
 <%@ page import="org.apache.hadoop.hbase.quotas.ThrottleSettings" %>
 <%@ page import="org.apache.hadoop.hbase.util.Bytes" %>
@@ -265,8 +266,16 @@
               for (int j = 0; j < numMetaReplicas; j++) {
                 RegionInfo meta = RegionReplicaUtil.getRegionInfoForReplica(
                         RegionInfoBuilder.FIRST_META_REGIONINFO, j);
-                ServerName metaLocation = 
MetaTableLocator.waitMetaRegionLocation(master.getZooKeeper(), j, 1);
+                //If a metaLocation is null, All of its info would be empty 
here to be displayed.
+                ServerName metaLocation = null;
+                try {
+                  metaLocation = 
MetaTableLocator.waitMetaRegionLocation(master.getZooKeeper(), j, 1);
+                } catch (NotAllMetaRegionsOnlineException e) {
+                  //Region in transition state here throw a 
NotAllMetaRegionsOnlineException causes
+                  //the UI crash.
+                }
                 for (int i = 0; i < 1; i++) {
+                  //If metaLocation is null, default value below would be 
displayed in UI.
                   String hostAndPort = "";
                   String readReq = "N/A";
                   String writeReq = "N/A";
@@ -340,8 +349,16 @@
               for (int j = 0; j < numMetaReplicas; j++) {
                 RegionInfo meta = RegionReplicaUtil.getRegionInfoForReplica(
                         RegionInfoBuilder.FIRST_META_REGIONINFO, j);
-                ServerName metaLocation = 
MetaTableLocator.waitMetaRegionLocation(master.getZooKeeper(), j, 1);
+                //If a metaLocation is null, All of its info would be empty 
here to be displayed.
+                ServerName metaLocation = null;
+                try {
+                  metaLocation = 
MetaTableLocator.waitMetaRegionLocation(master.getZooKeeper(), j, 1);
+                } catch (NotAllMetaRegionsOnlineException e) {
+                  //Region in transition state here throw a 
NotAllMetaRegionsOnlineException causes
+                  //the UI crash.
+                }
                 for (int i = 0; i < 1; i++) {
+                  //If metaLocation is null, default value below would be 
displayed in UI.
                   String hostAndPort = "";
                   long compactingCells = 0;
                   long compactedCells = 0;