This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 62f2383c700 HBASE-28191 Meta browser can happen NPE when server or
targetServer of region is null (#5511)
62f2383c700 is described below
commit 62f2383c7000b4df171a908e346e62d01ce594d1
Author: guluo <lupeng_n...@qq.com>
AuthorDate: Fri Nov 10 22:26:03 2023 +0800
HBASE-28191 Meta browser can happen NPE when server or targetServer of
region is null (#5511)
Signed-off-by: Duo Zhang <zhang...@apache.org>
---
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 2b4b73fbdef..2f730ab76cc 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -516,12 +516,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()
@@ -539,7 +540,7 @@
<td title="endKey"><%= endKeyDisplay %></td>
<td title="replicaId"><%= replicaIdDisplay %></td>
<td title="regionState"><%= regionStateDisplay %></td>
- <td title="<%= serverColumnName + "," + startCodeColumnName %>"><%=
buildRegionServerLink(serverName, rsPort, regionInfo, regionState) %></td>
+ <td title="<%= serverColumnName + "," + startCodeColumnName %>"><%=
serverName != null ? buildRegionServerLink(serverName,
master.getRegionServerInfoPort(serverName), regionInfo, regionState) : ""
%></td>
<td title="<%= seqNumColumnName %>"><%= seqNum %></td>
<td title="<%= serverNameColumnName %>"><%= targetServerName %></td>
<td><%= mergeRegionNames %></td>
