You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/05/11 16:39:24 UTC
hbase git commit: HBASE-15812 Revert pending investigation on whether
metrics dump can be re-implemented
Repository: hbase
Updated Branches:
refs/heads/master f3fee82ac -> c867858c4
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/master
Commit: c867858c4437e8159235bd64a53a900a152bb41a
Parents: f3fee82
Author: tedyu <yu...@gmail.com>
Authored: Wed May 11 09:39:20 2016 -0700
Committer: tedyu <yu...@gmail.com>
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);
}