You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2019/09/12 01:44:21 UTC
[hbase] branch branch-2.2 updated: HBASE-22993 HBCK report UI
showed -1 if hbck chore not running (#610)
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new a010bf1 HBASE-22993 HBCK report UI showed -1 if hbck chore not running (#610)
a010bf1 is described below
commit a010bf154ae31c7aa4cb165a34bc7d42a6b70f2f
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Thu Sep 12 09:09:57 2019 +0800
HBASE-22993 HBCK report UI showed -1 if hbck chore not running (#610)
Signed-off-by: stack <st...@apache.org>
---
.../src/main/resources/hbase-webapps/master/hbck.jsp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 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 6ae5d68..7b4e164 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
@@ -86,9 +86,13 @@
<h1>HBCK Chore Report</h1>
<p>
<% if (hbckChore.isDisabled()) { %>
- <span>HBCK chore is currently disabled. Set hbase.master.hbck.chore.interval > 0 in the config & do a rolling-restart to enable it.</span>
+ <span>HBCK chore is currently disabled. Set hbase.master.hbck.chore.interval > 0 in the config & do a rolling-restart to enable it.</span>
+ <% } else if (startTimestamp == 0 && endTimestamp == 0){ %>
+ <span>No report created. Execute <i>hbck_chore_run</i> in hbase shell to generate a new sub-report.</span>
+ <% } else if (startTimestamp > 0 && endTimestamp == 0){ %>
+ <span>Checking started at <%= iso8601start %>. Please wait for checking to generate a new sub-report.</span>
<% } else { %>
- <span>Checking started at <%= iso8601start %> and generated report at <%= iso8601end %>. Execute <i>hbck_chore_run</i> in hbase shell to generate a new sub-report.</span>
+ <span>Checking started at <%= iso8601start %> and generated report at <%= iso8601end %>. Execute <i>hbck_chore_run</i> in hbase shell to generate a new sub-report.</span>
<% } %>
</p>
</div>
@@ -192,7 +196,12 @@
<div class="row inner_header">
<div class="page-header">
<h1>CatalogJanitor <em>hbase:meta</em> Consistency Issues</h1>
- <p><span>Report created: <%= iso8601reportTime %> (now=<%= iso8601Now %>). Run <i>catalogjanitor_run</i> in hbase shell to generate a new sub-report.</span></p>
+ <p>
+ <% if (report != null) { %>
+ <span>Report created: <%= iso8601reportTime %> (now=<%= iso8601Now %>). Run <i>catalogjanitor_run</i> in hbase shell to generate a new sub-report.</span></p>
+ <% } else { %>
+ <span>No report created. Run <i>catalogjanitor_run</i> in hbase shell to generate a new sub-report.</span>
+ <% } %>
</div>
</div>
<% if (report != null && !report.isEmpty()) { %>