From commits-return-64592-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Sat Jan 6 04:35:15 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id AEFA2180647 for ; Sat, 6 Jan 2018 04:35:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9EED7160C3B; Sat, 6 Jan 2018 03:35:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E3506160C3F for ; Sat, 6 Jan 2018 04:35:14 +0100 (CET) Received: (qmail 2712 invoked by uid 500); 6 Jan 2018 03:35:13 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 1477 invoked by uid 99); 6 Jan 2018 03:35:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Jan 2018 03:35:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 750EEE9652; Sat, 6 Jan 2018 03:35:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Date: Sat, 06 Jan 2018 03:35:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/48] hbase git commit: HBASE-17436 Add column to master web UI for displaying region states when listing regions of a table. HBASE-17436 Add column to master web UI for displaying region states when listing regions of a table. Signed-off-by: Apekshit Sharma Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9cd0e1a4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9cd0e1a4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9cd0e1a4 Branch: refs/heads/HBASE-19397 Commit: 9cd0e1a490e118189289746686ec3aecef987b2a Parents: 5ce9351 Author: Janos Gub Authored: Fri Jan 5 14:30:10 2018 -0800 Committer: Apekshit Sharma Committed: Fri Jan 5 14:32:27 2018 -0800 ---------------------------------------------------------------------- .../main/resources/hbase-webapps/master/table.jsp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9cd0e1a4/hbase-server/src/main/resources/hbase-webapps/master/table.jsp ---------------------------------------------------------------------- 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 319c7bf..9252552 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -27,6 +27,7 @@ import="java.util.LinkedHashMap" import="java.util.List" import="java.util.Map" + import="java.util.HashMap" import="java.util.TreeMap" import="org.apache.commons.lang3.StringEscapeUtils" import="org.apache.hadoop.conf.Configuration" @@ -46,6 +47,8 @@ import="org.apache.hadoop.hbase.client.RegionReplicaUtil" import="org.apache.hadoop.hbase.client.Table" import="org.apache.hadoop.hbase.master.HMaster" + import="org.apache.hadoop.hbase.master.assignment.RegionStates" + import="org.apache.hadoop.hbase.master.RegionState" import="org.apache.hadoop.hbase.quotas.QuotaTableUtil" import="org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot" import="org.apache.hadoop.hbase.util.Bytes" @@ -247,6 +250,14 @@ if ( fqtn != null ) { <%} else { Admin admin = master.getConnection().getAdmin(); + RegionStates states = master.getAssignmentManager().getRegionStates(); + Map> regionStates = states.getRegionByStateOfTable(table.getName()); + Map stateMap = new HashMap<>(); + for (RegionState.State regionState : regionStates.keySet()) { + for (RegionInfo regionInfo : regionStates.get(regionState)) { + stateMap.put(regionInfo.getEncodedName(), regionState); + } + } RegionLocator r = master.getClusterConnection().getRegionLocator(table.getName()); try { %>

Table Attributes

@@ -452,6 +463,7 @@ ShowDetailName&Start/End Key <%= escapeXml(showWhole?Bytes.toStringBinary(regionInfo.getEndKey()):"-")%> + <%= state%> <% if (withReplica) { %>