From 5c2780ddc0ce4efdb1214c568d634c95ef8dbb2f Mon Sep 17 00:00:00 2001 From: Daisuke Kobayashi Date: Thu, 8 Aug 2019 20:07:10 +0900 Subject: [PATCH] HBASE-22543 Revisit HBASE-21207 to make all values fully sortable --- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 76 ++++++++++++++++++++-- .../hbase/tmpl/master/RegionServerListTmpl.jamon | 22 +++---- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 44 +++++++++++-- .../hbase/tmpl/regionserver/RegionListTmpl.jamon | 14 ++-- .../main/resources/hbase-webapps/master/table.jsp | 59 ++++++++++++++++- 5 files changed, 185 insertions(+), 30 deletions(-) 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 f30cf5de26..95b59a3c29 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 @@ -404,11 +404,77 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon index 7e983f5651..066fe53b4c 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon @@ -142,9 +142,9 @@ <% displayName %> <%if load != null %> - <% load.getReadRequestsCount() %> - <% load.getFilteredReadRequestsCount() %> - <% load.getWriteRequestsCount() %> + <% String.format("%,1d", load.getReadRequestsCount()) %> + <% String.format("%,1d", load.getFilteredReadRequestsCount()) %> + <% String.format("%,1d", load.getWriteRequestsCount()) %> @@ -182,8 +182,8 @@ <% displayName %> <%if load != null %> - <% load.getStores() %> - <% load.getStorefiles() %> + <% String.format("%,1d", load.getStores()) %> + <% String.format("%,1d", load.getStorefiles()) %> <% TraditionalBinaryPrefix.long2String(load.getStoreUncompressedSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1)%> <% TraditionalBinaryPrefix.long2String(load.getStorefileSizeMB() @@ -239,8 +239,8 @@ <% displayName %> <%if load != null %> - <% load.getTotalCompactingKVs() %> - <% load.getCurrentCompactedKVs() %> + <% String.format("%,1d", load.getTotalCompactingKVs()) %> + <% String.format("%,1d", load.getCurrentCompactedKVs()) %> <% percentDone %> <% compactTime %> 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 6b4427ebb2..fb1d513651 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -726,9 +726,62 @@ Actions: -- 2.15.0