You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by me...@apache.org on 2020/09/25 10:42:13 UTC
[hbase] branch branch-2 updated: HBASE-25097 Wrong RIT page number
in Master UI (#2458)
This is an automated email from the ASF dual-hosted git repository.
meiyi pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 0e6775c HBASE-25097 Wrong RIT page number in Master UI (#2458)
0e6775c is described below
commit 0e6775c919a64fac3e32cc7769c23efffc6f3384
Author: meiyi <my...@gmail.com>
AuthorDate: Fri Sep 25 18:36:41 2020 +0800
HBASE-25097 Wrong RIT page number in Master UI (#2458)
Signed-off-by: Viraj Jasani<vi...@apache.org>
---
.../apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon | 1 +
.../jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
index 7ec6ef4..ee899a7 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
@@ -120,6 +120,7 @@ int numOfPages = (int) Math.ceil(numOfRITs * 1.0 / ritsPerPage);
</%if>
</div>
<input type="hidden" id ="rit_page_num" value="<% numOfRITs %>" />
+ <input type="hidden" id ="rit_per_page" value="<% ritsPerPage %>" />
<nav id="rit_pagination"></nav>
</div>
</section>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index 69c5d16..65bb0f2 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -499,11 +499,12 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
if (!ritTotalNum || ritTotalNum < 1) {
return;
}
+ var ritPerPage = parseInt($("#rit_per_page").val());
$("#rit_pagination").sPage({
page:1,
total:ritTotalNum,
- pageSize:5,
+ pageSize:ritPerPage,
noData: false,
showPN:true,
prevPage:"prev",