This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new 0c40defe349 HBASE-28191 Meta browser can happen NPE when server or
targetServer of region is null (#5508)
0c40defe349 is described below
commit 0c40defe3490a4133b3eee37659b1e061cfb408d
Author: guluo <lupeng_n...@qq.com>
AuthorDate: Wed Nov 8 22:02:09 2023 +0800
HBASE-28191 Meta browser can happen NPE when server or targetServer of
region is null (#5508)
Signed-off-by: Wellington Chevreuil <wchevre...@apache.org>
Signed-off-by: Duo Zhang <zhang...@apache.org>
(cherry picked from commit 954a1f8fc392d19056cf11b896a188cda462c43b)
---
hbase-server/src/main/resources/hbase-webapps/master/table.jsp | 7 ++++---
1 file changed, 4 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 296e0e77f73..1d48a7561e1 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -562,12 +562,13 @@
final RegionInfo regionInfo = regionReplicaInfo.getRegionInfo();
final ServerName serverName = regionReplicaInfo.getServerName();
final RegionState.State regionState = regionReplicaInfo.getRegionState();
- final int rsPort = master.getRegionServerInfoPort(serverName);
final long seqNum = regionReplicaInfo.getSeqNum();
final String regionSpanFormat = "<span title=" +
HConstants.CATALOG_FAMILY_STR + ":%s>%s</span>";
- final String targetServerName =
regionReplicaInfo.getTargetServerName().toString();
+ final String targetServerName = regionReplicaInfo.getTargetServerName()
!= null
+ ? regionReplicaInfo.getTargetServerName().toString()
+ : "";
final Map<String, RegionInfo> mergeRegions =
regionReplicaInfo.getMergeRegionInfo();
final String mergeRegionNames = (mergeRegions == null) ? "" :
mergeRegions.entrySet().stream()
@@ -585,7 +586,7 @@
<td title="endKey"><%= endKeyDisplay %></td>
<td title="replicaId"><%= replicaIdDisplay %></td>
<td title="regionState"><%= regionStateDisplay %></td>
- <td title="<%= serverColumnName + "," + startCodeColumnName %>"><%=
buildRegionLink(serverName, rsPort, regionInfo, regionState) %></td>
+ <td title="<%= serverColumnName + "," + startCodeColumnName %>"><%=
serverName != null ? buildRegionLink(serverName,
master.getRegionServerInfoPort(serverName), regionInfo, regionState) : ""
%></td>
<td title="<%= seqNumColumnName %>"><%= seqNum %></td>
<td title="<%= serverNameColumnName %>"><%= targetServerName %></td>
<td><%= mergeRegionNames %></td>
