From 3b2b22b5fac1175302b320b7ca1ed766326924cc Mon Sep 17 00:00:00 2001 From: Apekshit Date: Fri, 8 Apr 2016 00:50:33 -0700 Subject: [PATCH] HBASE-19291 Use common header and footer for JSP pages Use header and footer in our *.jsp pages to avoid unnecessary redundancy (copy-paste of code) Misc edits: - Due to redundancy, new additions make it to some places but not others. For eg there are missing links to "/logLevel", "/processRS.jsp" in few places. - Fix processMaster.jsp wrongly pointing to rs-status instead of master-status (probably due to copy paste from processRS.jsp) - Deleted a bunch of extraneous "" in processMaster.jsp & processRS.jsp - Added missing tag in snapshot.jsp - Deleted fossils of html5shiv.js. It's uses and the js itself were deleted in the commit "819aed4ccd073d818bfef5931ec8d248bfae5f1f" - Fixed wrongly matched heading tags - Deleted some unused variables Tested: Ran standalone cluster and opened each page to make sure it looked right. Sidenote: Looks like HBASE-3835 started the work of converting from jsp to jamon, but the work didn't finish. Now we have a mix of jsp and jamon. Needs reconciling, but later. --- .../resources/hbase-webapps/master/footer.jsp | 24 ++++++ .../resources/hbase-webapps/master/header.jsp | 67 +++++++++++++++ .../hbase-webapps/master/procedures.jsp | 63 ++------------ .../hbase-webapps/master/processMaster.jsp | 85 +++++-------------- .../hbase-webapps/master/snapshot.jsp | 77 ++++------------- .../hbase-webapps/master/snapshotsStats.jsp | 52 ++---------- .../resources/hbase-webapps/master/table.jsp | 72 +++------------- .../hbase-webapps/master/tablesDetailed.jsp | 61 ++----------- .../resources/hbase-webapps/master/zk.jsp | 60 ++----------- .../hbase-webapps/regionserver/footer.jsp | 24 ++++++ .../hbase-webapps/regionserver/header.jsp | 65 ++++++++++++++ .../hbase-webapps/regionserver/processRS.jsp | 84 +++++------------- .../hbase-webapps/regionserver/region.jsp | 62 ++------------ .../hbase-webapps/regionserver/storeFile.jsp | 55 ++---------- 14 files changed, 288 insertions(+), 563 deletions(-) create mode 100644 hbase-server/src/main/resources/hbase-webapps/master/footer.jsp create mode 100644 hbase-server/src/main/resources/hbase-webapps/master/header.jsp create mode 100644 hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp create mode 100644 hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp diff --git a/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp new file mode 100644 index 00000000000..0aed242867d --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/footer.jsp @@ -0,0 +1,24 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--%> + + + + + \ No newline at end of file diff --git a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp new file mode 100644 index 00000000000..c7cbf3ec991 --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp @@ -0,0 +1,67 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--%> +<%@ page contentType="text/html;charset=UTF-8" + import="org.apache.hadoop.hbase.HBaseConfiguration" +%> + + + + + + <%= request.getParameter("pageTitle")%> + + + + + + + + + +
+
+
+ + + HBase Logo + +
+
+ +
+
+
\ No newline at end of file diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp index c3df2963d27..4e546cd7759 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp @@ -25,24 +25,19 @@ import="java.util.Date" import="java.util.List" import="java.util.Set" - import="org.apache.hadoop.conf.Configuration" - import="org.apache.hadoop.hbase.HBaseConfiguration" import="org.apache.hadoop.hbase.master.HMaster" import="org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv" import="org.apache.hadoop.hbase.master.procedure.ProcedureDescriber" import="org.apache.hadoop.hbase.procedure2.LockedResource" import="org.apache.hadoop.hbase.procedure2.Procedure" import="org.apache.hadoop.hbase.procedure2.ProcedureExecutor" - import="org.apache.hadoop.hbase.procedure2.ProcedureUtil" import="org.apache.hadoop.hbase.procedure2.store.wal.ProcedureWALFile" import="org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore" import="org.apache.hadoop.hbase.procedure2.util.StringUtils" - import="org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos" - import="org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil" import="org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix" %> <% - HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); + HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER); ProcedureExecutor procExecutor = master.getMasterProcedureExecutor(); WALProcedureStore walStore = master.getWalProcedureStore(); @@ -62,49 +57,12 @@ }); List lockedResources = master.getLocks(); + pageContext.setAttribute("pageTitle", "HBase Master Procedures: " + master.getServerName()); %> - - - - - - HBase Master Procedures: <%= master.getServerName() %> - - - + + + - - - - - -
-
-
- - HBase Logo -
-
- -
-
-
@@ -271,19 +229,16 @@ if (!waitingProcedures.isEmpty()) { %> -

Waiting procedures

- +

Waiting procedures

+
<% for (Procedure proc : procedures) { %> <% } %> -
<%= escapeXml(ProcedureDescriber.describe(proc)) %>
+ <% } %> <% } %>
- - - - + diff --git a/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp b/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp index 75da38aad5d..39ac83c337d 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp @@ -20,8 +20,6 @@ <%@ page contentType="text/html;charset=UTF-8" import="java.util.Date" import="java.util.List" - import="org.apache.hadoop.hbase.HBaseConfiguration" - import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml" import="javax.management.ObjectName" import="java.lang.management.ManagementFactory" import="java.lang.management.MemoryPoolMXBean" @@ -30,7 +28,6 @@ import="org.apache.hadoop.hbase.util.JSONMetricUtil" import="org.apache.hadoop.hbase.procedure2.util.StringUtils" import="org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix" - import="com.fasterxml.jackson.databind.JsonNode" %> <% RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); @@ -45,49 +42,12 @@ collector1 = gcBeans.get(0); collector2 = gcBeans.get(1); } catch(IndexOutOfBoundsException e) {} List mPools = JSONMetricUtil.getMemoryPools(); +pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.getProcessPID()); %> - - - - - - Process info for PID: <%= JSONMetricUtil.getProcessPID() %> - - - + + + - - - - - -
-
-
- - HBase Logo -
-
- -
-
-
@@ -103,10 +63,10 @@ List mPools = JSONMetricUtil.getMemoryPools(); - <%= new Date(runtimeBean.getStartTime()) %> - <%= StringUtils.humanTimeDiff(runtimeBean.getUptime()) %> - <%= JSONMetricUtil.getProcessPID() %> - <%= runtimeBean.getSystemProperties().get("user.name") %> + <%= new Date(runtimeBean.getStartTime()) %> + <%= StringUtils.humanTimeDiff(runtimeBean.getUptime()) %> + <%= JSONMetricUtil.getProcessPID() %> + <%= runtimeBean.getSystemProperties().get("user.name") %>
@@ -126,12 +86,12 @@ List mPools = JSONMetricUtil.getMemoryPools(); ThreadsTerminated - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsNew") %> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsRunnable")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsBlocked")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsWaiting")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTimedWaiting")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTerminated")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsNew") %> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsRunnable")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsBlocked")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsWaiting")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTimedWaiting")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTerminated")%>
@@ -208,20 +168,15 @@ if(mp.getName().contains("Cache")) continue;%> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getCommitted(), "B", 1) %> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getInit(), "B", 1) %> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getMax(), "B", 1) %> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getUsed(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getCommitted(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getInit(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getMax(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getUsed(), "B", 1) %> <%= JSONMetricUtil.calcPercentage(mp.getUsage().getUsed(), - mp.getUsage().getCommitted()) %> + mp.getUsage().getCommitted()) %>
<% } %> - - - - - - + diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp index 173361371af..b0cfe8737a7 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp @@ -26,7 +26,7 @@ import="org.apache.hadoop.hbase.snapshot.SnapshotInfo" import="org.apache.hadoop.util.StringUtils" import="org.apache.hadoop.hbase.TableName" - import="org.apache.hadoop.hbase.HBaseConfiguration" %> +%> <% HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); Configuration conf = master.getConfiguration(); @@ -51,64 +51,22 @@ } String action = request.getParameter("action"); - String cloneName = request.getParameter("cloneName"); boolean isActionResultPage = (!readOnly && action != null); + String pageTitle; + if (isActionResultPage) { + pageTitle = "HBase Master: " + master.getServerName(); + } else { + pageTitle = "Snapshot: " + snapshotName; + } + pageContext.setAttribute("pageTitle", pageTitle); %> - - - - - - <% if (isActionResultPage) { %> - HBase Master: <%= master.getServerName() %> - <% } else { %> - Snapshot: <%= snapshotName %> - <% } %> - - - - - - - <% if (isActionResultPage) { %> - - <% } %> - - -
-
-
- - HBase Logo -
-
- -
-
-
+ + + + +
<% if (snapshot == null) { %> -

Snapshot "<%= snapshotName %>" does not exist

@@ -116,7 +74,6 @@

Go Back, or wait for the redirect. <% } else { %> -

Snapshot: <%= snapshotName %>

@@ -178,10 +135,6 @@ <% } // end else %> +
- - - - - - + diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp index cf022c3de66..719ab4f2203 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp @@ -24,7 +24,6 @@ import="java.util.Map" import="org.apache.hadoop.conf.Configuration" import="org.apache.hadoop.fs.Path" - import="org.apache.hadoop.hbase.HBaseConfiguration" import="org.apache.hadoop.hbase.master.HMaster" import="org.apache.hadoop.hbase.snapshot.SnapshotInfo" import="org.apache.hadoop.hbase.TableName" @@ -50,48 +49,11 @@ totalArchivedSize, totalSharedSize, totalMobSize); totalSize = totalSharedSize.get() + totalArchivedSize.get() + totalMobSize.get(); } + pageContext.setAttribute("pageTitle", "HBase Master Snapshots: " + master.getServerName()); %> - - - - - - HBase Master Snapshots: <%= master.getServerName() %> - - - - - - - - - -
-
-
- - HBase Logo -
-
- -
-
-
+ + +
@@ -141,8 +103,4 @@
- - - - - + 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 ef37f79dced..c8ca50ba539 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -30,7 +30,6 @@ import="java.util.TreeMap" import="org.apache.commons.lang3.StringEscapeUtils" import="org.apache.hadoop.conf.Configuration" - import="org.apache.hadoop.hbase.HBaseConfiguration" import="org.apache.hadoop.hbase.HColumnDescriptor" import="org.apache.hadoop.hbase.HConstants" import="org.apache.hadoop.hbase.HRegionLocation" @@ -118,65 +117,19 @@ } int numRegions = 0; + String pageTitle; + if ( !readOnly && action != null ) { + pageTitle = "HBase Master: " + StringEscapeUtils.escapeHtml4(master.getServerName().toString()); + } else { + pageTitle = "Table: " + escaped_fqtn; + } + pageContext.setAttribute("pageTitle", pageTitle); %> - - - - - - <% if ( !readOnly && action != null ) { %> - HBase Master: <%= StringEscapeUtils.escapeHtml4(master.getServerName().toString()) %> - <% } else { %> - Table: <%= escaped_fqtn %> - <% } %> - - - + + + - - - - <% if ( ( !readOnly && action != null ) || fqtn == null ) { %> - - <% } else { %> - - <% } %> - - -
-
-
- - HBase Logo -
-
- -
-
-
<% if ( fqtn != null ) { try { @@ -889,11 +842,8 @@ Actions:

Go Back, or wait for the redirect.

<% } %> - - - - + - - - + diff --git a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp index 195161705c3..742dd514392 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp @@ -21,57 +21,15 @@ import="org.apache.commons.lang3.StringEscapeUtils" import="org.apache.hadoop.hbase.zookeeper.ZKUtil" import="org.apache.hadoop.hbase.zookeeper.ZKWatcher" - import="org.apache.hadoop.hbase.HBaseConfiguration" - import="org.apache.hadoop.hbase.master.HMaster"%><% + import="org.apache.hadoop.hbase.master.HMaster" +%> +<% HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); ZKWatcher watcher = master.getZooKeeper(); %> - - - - - - - ZooKeeper Dump - - - - - - - - - - - -
-
-
- - HBase Logo -
-
- -
-
-
- + + +
@@ -84,8 +42,4 @@
- - - - - + diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp new file mode 100644 index 00000000000..0aed242867d --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/footer.jsp @@ -0,0 +1,24 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--%> + + + + + \ No newline at end of file diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp new file mode 100644 index 00000000000..dcec0a17492 --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/header.jsp @@ -0,0 +1,65 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--%> +<%@ page contentType="text/html;charset=UTF-8" + import="org.apache.hadoop.hbase.HBaseConfiguration" +%> + + + + + + <%= request.getParameter("pageTitle")%> + + + + + + + + + +
+
+
+ + + HBase Logo + +
+
+ +
+
+
\ No newline at end of file diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp index 5c224abb6f2..f22358a8cc8 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp @@ -20,8 +20,6 @@ <%@ page contentType="text/html;charset=UTF-8" import="java.util.Date" import="java.util.List" - import="org.apache.hadoop.hbase.HBaseConfiguration" - import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml" import="javax.management.ObjectName" import="java.lang.management.ManagementFactory" import="java.lang.management.MemoryPoolMXBean" @@ -30,7 +28,6 @@ import="org.apache.hadoop.hbase.util.JSONMetricUtil" import="org.apache.hadoop.hbase.procedure2.util.StringUtils" import="org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix" - import="com.fasterxml.jackson.databind.JsonNode" %> <% RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); @@ -46,46 +43,12 @@ collector1 = gcBeans.get(0); collector2 = gcBeans.get(1); } catch(IndexOutOfBoundsException e) {} List mPools = JSONMetricUtil.getMemoryPools(); +pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.getProcessPID()); %> - - - - - - Process info for PID: <%= JSONMetricUtil.getProcessPID() %> - - - + + + - - - - - -
-
-
- - HBase Logo -
-
- -
-
-
@@ -102,12 +65,12 @@ List mPools = JSONMetricUtil.getMemoryPools(); - <%= new Date(runtimeBean.getStartTime()) %> - <%= StringUtils.humanTimeDiff(runtimeBean.getUptime()) %> - <%= JSONMetricUtil.getProcessPID() %> + <%= new Date(runtimeBean.getStartTime()) %> + <%= StringUtils.humanTimeDiff(runtimeBean.getUptime()) %> + <%= JSONMetricUtil.getProcessPID() %> <%= (long)JSONMetricUtil.getValueFromMBean(rsMetrics, "pauseWarnThresholdExceeded") - + (long)JSONMetricUtil.getValueFromMBean(rsMetrics, "pauseInfoThresholdExceeded") %> - <%= runtimeBean.getSystemProperties().get("user.name") %> + + (long)JSONMetricUtil.getValueFromMBean(rsMetrics, "pauseInfoThresholdExceeded") %> + <%= runtimeBean.getSystemProperties().get("user.name") %>
@@ -128,12 +91,12 @@ List mPools = JSONMetricUtil.getMemoryPools(); - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsNew") %> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsRunnable")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsBlocked")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsWaiting")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTimedWaiting")%> - <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTerminated")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsNew") %> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsRunnable")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsBlocked")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsWaiting")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTimedWaiting")%> + <%= JSONMetricUtil.getValueFromMBean(jvmMetrics, "ThreadsTerminated")%>
@@ -210,20 +173,15 @@ if(mp.getName().contains("Cache")) continue;%> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getCommitted(), "B", 1) %> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getInit(), "B", 1) %> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getMax(), "B", 1) %> - <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getUsed(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getCommitted(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getInit(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getMax(), "B", 1) %> + <%= TraditionalBinaryPrefix.long2String(mp.getUsage().getUsed(), "B", 1) %> <%= JSONMetricUtil.calcPercentage(mp.getUsage().getUsed(), - mp.getUsage().getCommitted()) %> + mp.getUsage().getCommitted()) %>
<% } %> - - - - - - + diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp index 62c589b1070..e2ea88ff40a 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/region.jsp @@ -21,9 +21,6 @@ import="java.util.Collection" import="java.util.Date" import="java.util.List" - import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml" - import="org.apache.hadoop.conf.Configuration" - import="org.apache.hadoop.hbase.HBaseConfiguration" import="org.apache.hadoop.hbase.client.RegionInfoDisplay" import="org.apache.hadoop.hbase.regionserver.HRegionServer" import="org.apache.hadoop.hbase.regionserver.Region" @@ -33,55 +30,15 @@ <% String regionName = request.getParameter("name"); HRegionServer rs = (HRegionServer) getServletContext().getAttribute(HRegionServer.REGIONSERVER); - Configuration conf = rs.getConfiguration(); Region region = rs.getRegion(regionName); String displayName = RegionInfoDisplay.getRegionNameAsStringForDisplay(region.getRegionInfo(), rs.getConfiguration()); + pageContext.setAttribute("pageTitle", "HBase RegionServer: " + rs.getServerName()); %> - - - - - - HBase RegionServer: <%= rs.getServerName() %> - - - - - - - - - - - - -
-
-
- - HBase Logo -
-
- -
-
-
+ + +
@@ -96,11 +53,11 @@ String cf = store.getColumnFamilyName(); Collection storeFiles = store.getStorefiles(); %> -

Column Family: <%= cf %>

+

Column Family: <%= cf %>

-

Memstore size (MB): <%= (int) (store.getMemStoreSize().getHeapSize() / 1024 / 1024) %>

+

Memstore size (MB): <%= (int) (store.getMemStoreSize().getHeapSize() / 1024 / 1024) %>

-

Store Files

+

Store Files

@@ -121,8 +78,5 @@ <% } }%> - - - - + diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp index 5997e242fa5..0def4e45c81 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/storeFile.jsp @@ -22,58 +22,18 @@ import="java.io.PrintStream" import="org.apache.hadoop.conf.Configuration" import="org.apache.hadoop.fs.Path" - import="org.apache.hadoop.hbase.HBaseConfiguration" import="org.apache.hadoop.hbase.io.hfile.HFilePrettyPrinter" import="org.apache.hadoop.hbase.regionserver.HRegionServer" - import="org.apache.hadoop.hbase.regionserver.StoreFile" - %> +%> <% String storeFile = request.getParameter("name"); HRegionServer rs = (HRegionServer) getServletContext().getAttribute(HRegionServer.REGIONSERVER); Configuration conf = rs.getConfiguration(); + pageContext.setAttribute("pageTitle", "HBase RegionServer: " + rs.getServerName()); %> - - - - - - HBase RegionServer: <%= rs.getServerName() %> - - - - - - - - - - - - -
-
-
- - HBase Logo -
-
- -
-
-
+ + +
@@ -103,8 +63,5 @@ %>
- - - - +