You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2020/01/16 14:01:17 UTC
[hbase] branch branch-2 updated (8b5f467 -> 9f9fa0d)
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 8b5f467 HBASE-23694 After RegionProcedureStore completes migration of WALProcedureStore, still running WALProcedureStore.syncThread keeps trying to delete now inexistent log files. (#1048)
new bd4eba2 Revert "fix 500/NPE of region.jsp (#1033)"
new 9f9fa0d HBASE-23677 fix 500/NPE of region.jsp (#1033)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[hbase] 01/02: Revert "fix 500/NPE of region.jsp (#1033)"
Posted by wc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit bd4eba2b53b7af738fd9584511d737c4393d0855
Author: Wellington Chevreuil <wc...@apache.org>
AuthorDate: Thu Jan 16 13:59:05 2020 +0000
Revert "fix 500/NPE of region.jsp (#1033)"
This reverts commit ae95b1f215a120890de5454739651911749057ca.
(reverting as commit message lacks jira id. Will rea-apply soon with the jira id)
---
.../src/main/resources/hbase-webapps/regionserver/region.jsp | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
index 382783e..8183c69 100644
--- a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
@@ -32,13 +32,8 @@
HRegionServer rs = (HRegionServer) getServletContext().getAttribute(HRegionServer.REGIONSERVER);
Region region = rs.getRegion(regionName);
- String displayName;
- if (region != null) {
- displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(),
- rs.getConfiguration());
- } else {
- displayName = "region {" + regionName + "} is not currently online on this region server";
- }
+ String displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(),
+ rs.getConfiguration());
pageContext.setAttribute("pageTitle", "HBase RegionServer: " + rs.getServerName());
%>
<jsp:include page="header.jsp">
[hbase] 02/02: HBASE-23677 fix 500/NPE of region.jsp (#1033)
Posted by wc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 9f9fa0d4123697083605a48feffc841601c59da9
Author: WenFeiYi <we...@gmail.com>
AuthorDate: Wed Jan 15 19:32:27 2020 +0800
HBASE-23677 fix 500/NPE of region.jsp (#1033)
Signed-off-by: Wellington Chevreuil <wc...@apache.org>
(cherry picked from commit d60ce17c1765a445e944738f49953579bdf0bba6)
---
.../src/main/resources/hbase-webapps/regionserver/region.jsp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
index 8183c69..382783e 100644
--- a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp
@@ -32,8 +32,13 @@
HRegionServer rs = (HRegionServer) getServletContext().getAttribute(HRegionServer.REGIONSERVER);
Region region = rs.getRegion(regionName);
- String displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(),
- rs.getConfiguration());
+ String displayName;
+ if (region != null) {
+ displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(),
+ rs.getConfiguration());
+ } else {
+ displayName = "region {" + regionName + "} is not currently online on this region server";
+ }
pageContext.setAttribute("pageTitle", "HBase RegionServer: " + rs.getServerName());
%>
<jsp:include page="header.jsp">