From 9b982c79a7f037bbb108b44bda0f7f43b4dfb90d Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 26 Aug 2013 15:48:50 -0700 Subject: [PATCH] HBASE-9342 WebUI fixes after bootstrap 3.0 update --- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 5 +- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 6 +- .../resources/hbase-webapps/master/snapshot.jsp | 50 ++++++----------- .../main/resources/hbase-webapps/master/table.jsp | 59 ++++++++++---------- .../hbase-webapps/master/tablesDetailed.jsp | 34 +++++------ .../src/main/resources/hbase-webapps/master/zk.jsp | 58 +++++++++---------- .../src/main/resources/hbase-webapps/rest/rest.jsp | 26 ++++----- pom.xml | 5 +- 8 files changed, 110 insertions(+), 133 deletions(-) diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 9cb2bc5..1696cce 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -126,10 +126,9 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <%if HBaseConfiguration.isShowConfInServlet()%>
  • HBase Configuration
  • - - + + -
    diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 7816125..e0a6a41 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -56,10 +56,6 @@ org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad; - - @@ -72,7 +68,7 @@ org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad; - HBase Logo + HBase Logo
    - - + <% if (isActionResultPage) { %>
    -
    + -


    <% @@ -135,23 +125,17 @@ <% } else if (snapshot == null) { %>

    -
    + -

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

    -
    + -
    - HBase logo -

    Snapshot Attributes

    diff --git hbase-server/src/main/resources/hbase-webapps/master/table.jsp hbase-server/src/main/resources/hbase-webapps/master/table.jsp index 7c2581e..5aa5a55 100644 --- hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -20,13 +20,11 @@ <%@ page contentType="text/html;charset=UTF-8" import="static org.apache.commons.lang.StringEscapeUtils.escapeXml" import="java.util.HashMap" - import="java.util.List" import="java.util.Map" import="org.apache.hadoop.conf.Configuration" import="org.apache.hadoop.hbase.client.HTable" import="org.apache.hadoop.hbase.client.HBaseAdmin" import="org.apache.hadoop.hbase.client.HConnectionManager" - import="org.apache.hadoop.hbase.HConstants" import="org.apache.hadoop.hbase.HRegionInfo" import="org.apache.hadoop.hbase.ServerName" import="org.apache.hadoop.hbase.ServerLoad" @@ -34,8 +32,8 @@ import="org.apache.hadoop.hbase.master.HMaster" import="org.apache.hadoop.hbase.util.Bytes" import="org.apache.hadoop.hbase.util.FSUtils" - import="org.apache.hadoop.hbase.protobuf.ProtobufUtil"%> -<%@ page import="org.apache.hadoop.hbase.TableName" %> + import="org.apache.hadoop.hbase.TableName" + import="org.apache.hadoop.hbase.HBaseConfiguration" %> <% HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); Configuration conf = master.getConfiguration(); @@ -73,9 +71,9 @@ - - - + + + @@ -91,17 +89,19 @@ - - + +
    @@ -145,35 +145,36 @@ - - - + + + -
    - + -
    +