Return-Path: <commits-return-40306-archive-asf-public=cust-asf.ponee.io@hbase.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 33AD4200B9A
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri,  7 Oct 2016 19:04:42 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 3297C160AE8; Fri,  7 Oct 2016 17:04:42 +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 72A2F160AC6
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  7 Oct 2016 19:04:41 +0200 (CEST)
Received: (qmail 64727 invoked by uid 500); 7 Oct 2016 17:04:40 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 64716 invoked by uid 99); 7 Oct 2016 17:04:40 -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; Fri, 07 Oct 2016 17:04:40 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 64B2EDFF03; Fri,  7 Oct 2016 17:04:40 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: garyh@apache.org
To: commits@hbase.apache.org
Message-Id: <7df6a591de5946fe925af46ddd3e0d01@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-16657 Expose per-region last major compaction
 time in RegionServer UI
Date: Fri,  7 Oct 2016 17:04:40 +0000 (UTC)
archived-at: Fri, 07 Oct 2016 17:04:42 -0000

Repository: hbase
Updated Branches:
  refs/heads/master 62bc09012 -> bc9a97245


HBASE-16657 Expose per-region last major compaction time in RegionServer UI

Signed-off-by: Gary Helmling <garyh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bc9a9724
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bc9a9724
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bc9a9724

Branch: refs/heads/master
Commit: bc9a972451b2899dec1921bc34e86945df304547
Parents: 62bc090
Author: Dustin Pho <pho@fb.com>
Authored: Sat Sep 24 17:53:55 2016 -0700
Committer: Gary Helmling <garyh@apache.org>
Committed: Fri Oct 7 09:49:24 2016 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon     | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/bc9a9724/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
----------------------------------------------------------------------
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 ab45799..b393137 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
@@ -22,6 +22,7 @@
 </%args>
 <%import>
         java.util.*;
+        org.apache.commons.lang.time.FastDateFormat;
         org.apache.hadoop.hbase.regionserver.HRegionServer;
         org.apache.hadoop.hbase.util.Bytes;
         org.apache.hadoop.hbase.HRegionInfo;
@@ -197,6 +198,7 @@
             <th>Num. Compacting KVs</th>
             <th>Num. Compacted KVs</th>
             <th>Compaction Progress</th>
+            <th>Last Major Compaction</th>
         </tr>
 
         <%for HRegionInfo r: onlineRegions %>
@@ -211,12 +213,19 @@
             }
             String displayName = HRegionInfo.getRegionNameAsStringForDisplay(r,
               regionServer.getConfiguration());
+            long lastMajorCompactionTs = load.getLastMajorCompactionTs();
+            String compactTime = "";
+            if (lastMajorCompactionTs > 0) {
+              FastDateFormat fdf = FastDateFormat.getInstance("yyyy-MM-dd HH:mm ZZ");
+              compactTime = fdf.format(lastMajorCompactionTs);
+            }
         </%java>
             <td><a href="region.jsp?name=<% r.getEncodedName() %>"><% displayName %></a></td>
             <%if load != null %>
             <td><% load.getTotalCompactingKVs() %></td>
             <td><% load.getCurrentCompactedKVs() %></td>
             <td><% percentDone %></td>
+            <td><% compactTime %></td>
             </%if>
         </tr>
         </%for>