From 719d2f012894dbc0179992ec73d265e7a7d33b61 Mon Sep 17 00:00:00 2001 From: samirMop Date: Mon, 3 Jul 2017 13:00:45 +0200 Subject: [PATCH] HBASE-15943 Add page displaying JVM process metrics --- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 1 + .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 1 + .../apache/hadoop/hbase/util/JSONMetricUtil.java | 214 +++++++++++++++++++ .../resources/hbase-webapps/master/procedures.jsp | 1 + .../hbase-webapps/master/processMaster.jsp | 228 ++++++++++++++++++++ .../resources/hbase-webapps/master/processRS.jsp | 230 +++++++++++++++++++++ .../resources/hbase-webapps/master/snapshot.jsp | 1 + .../main/resources/hbase-webapps/master/table.jsp | 1 + .../hbase-webapps/master/tablesDetailed.jsp | 1 + .../src/main/resources/hbase-webapps/master/zk.jsp | 1 + .../hbase-webapps/regionserver/processRS.jsp | 230 +++++++++++++++++++++ .../hbase-webapps/regionserver/region.jsp | 1 + .../hadoop/hbase/util/TestJSONMetricUtil.java | 106 ++++++++++ 13 files changed, 1016 insertions(+) create mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/util/JSONMetricUtil.java create mode 100644 hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp create mode 100644 hbase-server/src/main/resources/hbase-webapps/master/processRS.jsp create mode 100644 hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestJSONMetricUtil.java 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 58ae3eb..708e72d 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 @@ -128,6 +128,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <%if master.isActiveMaster() %>
  • Procedures & Locks
  • +
  • Process Metrics
  • Local Logs
  • Log Level
  • Debug Dump
  • diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 3a68d96..7219c0a 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -81,6 +81,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;