You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/10/29 01:08:34 UTC
svn commit: r1190663 - in /hbase/branches/0.92: ./
src/main/jamon/org/apache/hbase/tmpl/common/
src/main/jamon/org/apache/hbase/tmpl/master/
src/main/jamon/org/apache/hbase/tmpl/regionserver/
src/main/java/org/apache/hadoop/hbase/ src/main/resources/hb...
Author: stack
Date: Fri Oct 28 23:08:34 2011
New Revision: 1190663
URL: http://svn.apache.org/viewvc?rev=1190663&view=rev
Log:
HBASE-4699 Cleanup the UIs
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon
hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HServerLoad.java
hbase/branches/0.92/src/main/resources/hbase-webapps/static/hbase.css
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1190663&r1=1190662&r2=1190663&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Oct 28 23:08:34 2011
@@ -650,6 +650,7 @@ Release 0.92.0 - Unreleased
instead of one per method (nkeywal)
HBASE-3929 Add option to HFile tool to produce basic stats (Matteo
Bertozzi and todd via todd)
+ HBASE-4699 Cleanup the UIs
TASKS
Modified: hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon?rev=1190663&r1=1190662&r2=1190663&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon (original)
+++ hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/common/TaskMonitorTmpl.jamon Fri Oct 28 23:08:34 2011
@@ -56,15 +56,15 @@ boolean first = true;
<%if format.equals("json")%>
[<%for MonitoredTask task : tasks%><%if first%><%java>first = false;</%java><%else>,</%if><% task.toJSON() %></%for>]
<%else>
- <div style="float:right;">
- <a href="?filter=all">Show All Monitored Tasks</a> |
- <a href="?filter=general">Show non-RPC Tasks</a> |
- <a href="?filter=handler">Show All RPC Handler Tasks</a> |
- <a href="?filter=rpc">Show Active RPC Calls</a> |
- <a href="?filter=operation">Show Client Operations</a> |
+<h2>Tasks</h2>
+ <div id="tasks_menu">
+ <a href="?filter=all">Show All Monitored Tasks</a>
+ <a href="?filter=general">Show non-RPC Tasks</a>
+ <a href="?filter=handler">Show All RPC Handler Tasks</a>
+ <a href="?filter=rpc">Show Active RPC Calls</a>
+ <a href="?filter=operation">Show Client Operations</a>
<a href="?format=json&filter=<% filter %>">View as JSON</a>
</div>
- <h2>Recent tasks</h2>
<%if tasks.isEmpty()%>
No tasks currently running on this node.
<%else>
Modified: hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1190663&r1=1190662&r2=1190663&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon Fri Oct 28 23:08:34 2011
@@ -55,7 +55,7 @@ org.apache.hadoop.hbase.HTableDescriptor
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-<title>HBase Master: <% master.getServerName().getHostAndPort() %></title>
+<title>HBase Master: <% master.getServerName() %></title>
<link rel="stylesheet" type="text/css" href="/static/hbase.css" />
</head>
<body>
@@ -87,13 +87,12 @@ org.apache.hadoop.hbase.HTableDescriptor
</%if>
<hr id="head_rule" />
-
-<h2>Master Attributes</h2>
-<table>
+<h2>Attributes</h2>
+<table id="attributes_table">
<tr><th>Attribute Name</th><th>Value</th><th>Description</th></tr>
-<tr><td>HBase Version</td><td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and svn revision</td></tr>
+<tr><td>HBase Version</td><td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and revision</td></tr>
<tr><td>HBase Compiled</td><td><% org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <% org.apache.hadoop.hbase.util.VersionInfo.getUser() %></td><td>When HBase version was compiled and by whom</td></tr>
-<tr><td>Hadoop Version</td><td><% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %></td><td>Hadoop version and svn revision</td></tr>
+<tr><td>Hadoop Version</td><td><% org.apache.hadoop.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.util.VersionInfo.getRevision() %></td><td>Hadoop version and revision</td></tr>
<tr><td>Hadoop Compiled</td><td><% org.apache.hadoop.util.VersionInfo.getDate() %>, <% org.apache.hadoop.util.VersionInfo.getUser() %></td><td>When Hadoop version was compiled and by whom</td></tr>
<tr><td>HBase Root Directory</td><td><% FSUtils.getRootDir(master.getConfiguration()).toString() %></td><td>Location of HBase home directory</td></tr>
<tr><td>HBase Cluster ID</td><td><% master.getClusterId() != null ? master.getClusterId() : "Not set" %><td>Unique identifier generated for each HBase cluster</td></tr>
@@ -132,10 +131,10 @@ org.apache.hadoop.hbase.HTableDescriptor
<%def catalogTables>
-<h2>Catalog Tables</h2>
+<h2>Tables</h2>
<table>
<tr>
- <th>Table</th>
+ <th>Catalog Table</th>
<%if (frags != null) %>
<th title="Fragmentation - Will be 0% after a major compaction and fluctuate during normal usage.">Frag.</th>
</%if>
@@ -162,7 +161,6 @@ org.apache.hadoop.hbase.HTableDescriptor
</%def>
<%def userTables>
-<h2>User Tables</h2>
<%java>
HTableDescriptor[] tables = admin.listTables();
HConnectionManager.deleteConnection(admin.getConfiguration(), false);
@@ -170,7 +168,7 @@ org.apache.hadoop.hbase.HTableDescriptor
<%if (tables != null && tables.length > 0)%>
<table>
<tr>
- <th>Table</th>
+ <th>User Table</th>
<%if (frags != null) %>
<th title="Fragmentation - Will be 0% after a major compaction and fluctuate during normal usage.">Frag.</th>
</%if>
@@ -200,7 +198,7 @@ org.apache.hadoop.hbase.HTableDescriptor
</%java>
<table>
-<tr><th rowspan="<% servers.size() + 1%>"></th><th>Address</th><th>Start Code</th><th>Load</th></tr>
+<tr><th rowspan="<% servers.size() + 1%>"></th><th>ServerName</th><th>Load</th></tr>
<%java>
ServerName [] serverNames = servers.toArray(new ServerName[servers.size()]);
Arrays.sort(serverNames);
@@ -208,21 +206,19 @@ org.apache.hadoop.hbase.HTableDescriptor
// TODO: this is incorrect since this conf might differ from RS to RS
// or be set to 0 to get ephemeral ports
int infoPort = master.getConfiguration().getInt("hbase.regionserver.info.port", 60030);
- String hostname = serverName.getHostname() + ":" + infoPort;
- String url = "http://" + hostname + "/";
+ String url = "http://" + serverName.getHostname() + ":" + infoPort + "/";
HServerLoad hsl = master.getServerManager().getLoad(serverName);
String loadStr = hsl == null? "-": hsl.toString();
if (hsl != null) {
totalRegions += hsl.getNumberOfRegions();
totalRequests += hsl.getNumberOfRequests();
}
- long startCode = serverName.getStartcode();
</%java>
-<tr><td><a href="<% url %>"><% hostname %></a></td><td><% startCode %><% serverName %></td><td><% loadStr %></td></tr>
+<tr><td><a href="<% url %>"><% serverName %></a></td></td><td><% loadStr %></td></tr>
<%java>
}
</%java>
-<tr><th>Total: </th><td>servers: <% servers.size() %></td><td> </td><td>requestsPerSecond=<% totalRequests %>, numberOfOnlineRegions=<% totalRegions %></td></tr>
+<tr><th>Total: </th><td>servers: <% servers.size() %></td><td>requestsPerSecond=<% totalRequests %>, numberOfOnlineRegions=<% totalRegions %></td></tr>
</table>
<p>Load is requests per second and count of regions loaded</p>
@@ -230,20 +226,18 @@ org.apache.hadoop.hbase.HTableDescriptor
</%def>
<%def deadRegionServers>
-<h2>Dead Region Servers</h2>
+<h3>Dead Region Servers</h3>
<%if (deadServers != null && deadServers.size() > 0)%>
<table>
-<tr><th rowspan="<% deadServers.size() + 1%>"></th><th>Address</th><th>Start Code</th></tr>
+<tr><th rowspan="<% deadServers.size() + 1%>"></th><th>ServerName</th></tr>
<%java>
ServerName [] deadServerNames = deadServers.toArray(new ServerName[deadServers.size()]);
Arrays.sort(deadServerNames);
for (ServerName deadServerName: deadServerNames) {
int infoPort = master.getConfiguration().getInt("hbase.regionserver.info.port", 60030);
- String hostname = deadServerName.getHostname() + ":" + infoPort;
- long startcode = deadServerName.getStartcode();
</%java>
-<tr><td><% hostname %></td><td><% startcode %></tr>
+<tr><td><% deadServerName %></td></tr>
<%java>
}
</%java>
Modified: hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1190663&r1=1190662&r2=1190663&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon (original)
+++ hbase/branches/0.92/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon Fri Oct 28 23:08:34 2011
@@ -34,6 +34,7 @@ org.apache.hadoop.hbase.HConstants;
org.apache.hadoop.hbase.HServerInfo;
org.apache.hadoop.hbase.HServerLoad;
org.apache.hadoop.hbase.HRegionInfo;
+org.apache.hadoop.hbase.ServerName;
</%import>
<%if format.equals("json") %>
<& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
@@ -41,8 +42,10 @@ org.apache.hadoop.hbase.HRegionInfo;
</%if>
<%java>
HServerInfo serverInfo = null;
+ ServerName serverName = null;
try {
serverInfo = regionServer.getHServerInfo();
+ serverName = regionServer.getServerName();
} catch (IOException e) {
e.printStackTrace();
}
@@ -58,13 +61,13 @@ org.apache.hadoop.hbase.HRegionInfo;
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-<title>HBase Region Server: <% serverInfo.getServerAddress().getHostname() %>:<% serverInfo.getServerAddress().getPort() %></title>
+<title>HBase Region Server: <% serverName %>:<% serverInfo.getServerAddress().getPort() %></title>
<link rel="stylesheet" type="text/css" href="/static/hbase.css" />
</head>
<body>
<a id="logo" href="http://wiki.apache.org/lucene-hadoop/Hbase"><img src="/static/hbase_logo.png" alt="HBase Logo" title="HBase Logo" /></a>
-<h1 id="page_title">Region Server: <% serverInfo.getServerAddress().getHostname() %>:<% serverInfo.getServerAddress().getPort() %></h1>
+<h1 id="page_title">RegionServer: <% serverName %></h1>
<p id="links_menu">
<a href="/logs/">Local logs</a>,
<a href="/stacks">Thread Dump</a>,
@@ -73,10 +76,13 @@ org.apache.hadoop.hbase.HRegionInfo;
</p>
<hr id="head_rule" />
-<h2>Region Server Attributes</h2>
-<table>
+<h2>Attributes</h2>
+<table id="attributes_table">
+<col style="width: 10%;"/>
+<col />
+<col style="width: 20%;"/>
<tr><th>Attribute Name</th><th>Value</th><th>Description</th></tr>
-<tr><td>HBase Version</td><td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and svn revision</td></tr>
+<tr><td>HBase Version</td><td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and revision</td></tr>
<tr><td>HBase Compiled</td><td><% org.apache.hadoop.hbase.util.VersionInfo.getDate() %>, <% org.apache.hadoop.hbase.util.VersionInfo.getUser() %></td><td>When HBase version was compiled and by whom</td></tr>
<tr><td>Metrics</td><td><% metrics.toString() %></td><td>RegionServer Metrics; file and heap sizes are in megabytes</td></tr>
<tr><td>Zookeeper Quorum</td><td><% regionServer.getZooKeeper().getQuorum() %></td><td>Addresses of all registered ZK servers</td></tr>
@@ -91,7 +97,7 @@ org.apache.hadoop.hbase.HRegionInfo;
<& ../common/TaskMonitorTmpl; filter = filter &>
-<h2>Online Regions</h2>
+<h2>Regions</h2>
<%if (onlineRegions != null && onlineRegions.size() > 0) %>
<table>
<tr><th>Region Name</th><th>Start Key</th><th>End Key</th><th>Metrics</th></tr>
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HServerLoad.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HServerLoad.java?rev=1190663&r1=1190662&r2=1190663&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HServerLoad.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HServerLoad.java Fri Oct 28 23:08:34 2011
@@ -544,10 +544,6 @@ implements WritableComparable<HServerLoa
sb = Strings.appendKeyValue(sb, "usedHeapMB",
Integer.valueOf(this.usedHeapMB));
sb = Strings.appendKeyValue(sb, "maxHeapMB", Integer.valueOf(maxHeapMB));
- String coprocessors = Arrays.toString(getCoprocessors());
- if (coprocessors != null) {
- sb = Strings.appendKeyValue(sb, "coprocessors", coprocessors);
- }
return sb.toString();
}
Modified: hbase/branches/0.92/src/main/resources/hbase-webapps/static/hbase.css
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/resources/hbase-webapps/static/hbase.css?rev=1190663&r1=1190662&r2=1190663&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/resources/hbase-webapps/static/hbase.css (original)
+++ hbase/branches/0.92/src/main/resources/hbase-webapps/static/hbase.css Fri Oct 28 23:08:34 2011
@@ -20,9 +20,12 @@ table { border: thin solid DodgerBlue }
tr { border: thin solid DodgerBlue }
td { border: thin solid DodgerBlue }
th { border: thin solid DodgerBlue }
-#logo {float: left;}
+#logo {float: right;}
#logo img {border: none;}
-#page_title {padding-top: 27px;}
+#page_title {}
+#tasks_menu {
+ padding: 10px;
+}
div.warning {
border: 1px solid #666;