This is an automated email from the ASF dual-hosted git repository.
paksyd pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 9698c236ca1 HBASE-29556: Display HBCK and CatalogJanitor report errors
properly on HBCK Report page (#7255)
9698c236ca1 is described below
commit 9698c236ca1be853f4ae7ff022ce4942ed02e227
Author: Dávid Paksy <[email protected]>
AuthorDate: Wed Sep 3 11:28:30 2025 +0200
HBASE-29556: Display HBCK and CatalogJanitor report errors properly on HBCK
Report page (#7255)
Signed-off-by: Nihal Jain <[email protected]>
(cherry picked from commit 394db1686724336c3afa243b1f0a70f8c5fe4ab8)
---
.../main/resources/hbase-webapps/master/hbck.jsp | 24 ++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
b/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
index 38e16ca8e28..a6c6c2d17e6 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
@@ -39,21 +39,24 @@
<%@ page import="org.apache.hadoop.hbase.master.janitor.CatalogJanitorReport"
%>
<%@ page import="java.util.Optional" %>
<%@ page import="org.apache.hadoop.hbase.util.EnvironmentEdgeManager" %>
+<%@ page
import="org.apache.hbase.thirdparty.com.google.protobuf.ServiceException" %>
<%
final String cacheParameterValue = request.getParameter("cache");
final HMaster master = (HMaster)
getServletContext().getAttribute(HMaster.MASTER);
pageContext.setAttribute("pageTitle", "HBase Master HBCK Report: " +
master.getServerName());
+ String hbckChoreErrorMessage = null;
+ String catalogJanitorErrorMessage = null;
if (!Boolean.parseBoolean(cacheParameterValue)) {
// Run the two reporters inline w/ drawing of the page. If exception, will
show in page draw.
try {
master.getMasterRpcServices().runHbckChore(null, null);
- } catch (org.apache.hbase.thirdparty.com.google.protobuf.ServiceException
se) {
- out.write("Failed generating a new hbck_chore report; using cache; try
again or run hbck_chore_run in the shell: " + se.getMessage() + "\n");
+ } catch (ServiceException se) {
+ hbckChoreErrorMessage = "Failed generating a new hbck_chore report;
using cache; try again or run hbck_chore_run in the shell: " + se.getMessage();
}
try {
master.getMasterRpcServices().runCatalogScan(null, null);
- } catch (org.apache.hbase.thirdparty.com.google.protobuf.ServiceException
se) {
- out.write("Failed generating a new catalogjanitor report; using cache;
try again or run catalogjanitor_run in the shell: " + se.getMessage() + "\n");
+ } catch (ServiceException se) {
+ catalogJanitorErrorMessage = "Failed generating a new catalogjanitor
report; using cache; try again or run catalogjanitor_run in the shell: " +
se.getMessage();
}
}
HbckChore hbckChore = master.getHbckChore();
@@ -119,6 +122,12 @@
</div>
</div>
+ <% if(hbckChoreErrorMessage != null) { %>
+ <div class="alert alert-danger" role="alert">
+ <%= hbckChoreErrorMessage %>
+ </div>
+ <% } %>
+
<% if (hbckReport != null && hbckReport.getInconsistentRegions().size() > 0)
{ %>
<div class="row">
<div class="page-header">
@@ -230,6 +239,13 @@
<% } %>
</div>
</div>
+
+ <% if(catalogJanitorErrorMessage != null) { %>
+ <div class="alert alert-danger" role="alert">
+ <%= catalogJanitorErrorMessage %>
+ </div>
+ <% } %>
+
<% if (cjReport != null && !cjReport.isEmpty()) { %>
<% if (!cjReport.getHoles().isEmpty()) { %>
<div class="row inner_header">
