Return-Path: 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 D9A2E200AEF for ; Fri, 13 May 2016 23:36:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D883C16099F; Fri, 13 May 2016 21:36:58 +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 2EC61160A16 for ; Fri, 13 May 2016 23:36:58 +0200 (CEST) Received: (qmail 54439 invoked by uid 500); 13 May 2016 21:36:56 -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 54114 invoked by uid 99); 13 May 2016 21:36:56 -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, 13 May 2016 21:36:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0C5EEAB44; Fri, 13 May 2016 21:36:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: commits@hbase.apache.org Date: Fri, 13 May 2016 21:37:04 -0000 Message-Id: <28f976a7e1534b8ea53c0b6af52f9f38@git.apache.org> In-Reply-To: <80b9b2e3d844456dab1a41ae325c5104@git.apache.org> References: <80b9b2e3d844456dab1a41ae325c5104@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] [abbrv] hbase git commit: HBASE-15812 Revert pending investigation on whether metrics dump can be re-implemented archived-at: Fri, 13 May 2016 21:36:59 -0000 HBASE-15812 Revert pending investigation on whether metrics dump can be re-implemented Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c867858c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c867858c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c867858c Branch: refs/heads/HBASE-14850 Commit: c867858c4437e8159235bd64a53a900a152bb41a Parents: f3fee82 Author: tedyu Authored: Wed May 11 09:39:20 2016 -0700 Committer: tedyu Committed: Wed May 11 09:39:20 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/http/HttpServer.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c867858c/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java index 154ecf5..667e597 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java @@ -58,6 +58,7 @@ import org.apache.hadoop.hbase.http.jmx.JMXJsonServlet; import org.apache.hadoop.hbase.http.log.LogLevel; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.util.ReflectionUtils; +import org.apache.hadoop.metrics.MetricsServlet; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authentication.server.AuthenticationFilter; @@ -675,6 +676,7 @@ public class HttpServer implements FilterContainer { // set up default servlets addServlet("stacks", "/stacks", StackServlet.class); addServlet("logLevel", "/logLevel", LogLevel.Servlet.class); + addServlet("metrics", "/metrics", MetricsServlet.class); addServlet("jmx", "/jmx", JMXJsonServlet.class); addServlet("conf", "/conf", ConfServlet.class); }