Index: src/webapps/master/master.jsp
===================================================================
--- src/webapps/master/master.jsp (revision 779254)
+++ src/webapps/master/master.jsp (working copy)
@@ -7,9 +7,12 @@
import="org.apache.hadoop.hbase.HConstants"
import="org.apache.hadoop.hbase.master.MetaRegion"
import="org.apache.hadoop.hbase.client.HBaseAdmin"
+ import="org.apache.hadoop.hbase.io.ImmutableBytesWritable"
import="org.apache.hadoop.hbase.HServerInfo"
import="org.apache.hadoop.hbase.HServerAddress"
import="org.apache.hadoop.hbase.HBaseConfiguration"
+ import="org.apache.hadoop.hbase.HColumnDescriptor"
+ import="org.apache.hadoop.hbase.client.tableindexed.IndexSpecification"
import="org.apache.hadoop.hbase.HTableDescriptor" %><%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
HBaseConfiguration conf = master.getConfiguration();
@@ -29,6 +32,17 @@
HBase Master: <%= master.getMasterAddress().getHostname()%>:<%= master.getMasterAddress().getPort() %>
+
+
+
+
+
@@ -46,8 +60,8 @@
| Hadoop Version | <%= org.apache.hadoop.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.util.VersionInfo.getRevision() %> | Hadoop version and svn revision |
| Hadoop Compiled | <%= org.apache.hadoop.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.util.VersionInfo.getUser() %> | When Hadoop version was compiled and by whom |
| HBase Root Directory | <%= master.getRootDir().toString() %> | Location of HBase home directory |
-| Load average | <%= master.getAverageLoad() %> | Average load across all region servers. Naive computation. |
-| Regions On FS | <%= master.countRegionsOnFS() %> | The Number of regions on FileSystem. Rough count. |
+| Load average | <%= master.getAverageLoad() %> | Average number of regions per regionserver. Naive computation. |
+| Regions On FS | <%= master.countRegionsOnFS() %> | Number of regions on FileSystem. Rough count. |
Catalog Tables
@@ -55,10 +69,10 @@
if (rootLocation != null) { %>
@@ -67,11 +81,69 @@
User Tables
<% HTableDescriptor[] tables = new HBaseAdmin(conf).listTables();
if(tables != null && tables.length > 0) { %>
-
-| Table | Description |
-<% for(HTableDescriptor htDesc : tables ) { %>
-| ><%= htDesc.getNameAsString() %> | <%= htDesc.toString() %> |
+
+
+
+<% for(HTableDescriptor htDesc : tables) { %>
+- <%= htDesc.getNameAsString() %>
+
+- Parameters
+
+<% Map vals = htDesc.getValues();
+ if (vals.size() > 0) {
+ for (Map.Entry e: vals.entrySet()) { %>
+- <%= Bytes.toString(e.getKey().get()).toLowerCase() %>: <%= Bytes.toString(e.getValue().get()).toLowerCase() %>
+<% }
+ } else { %>
+- none
+<% } %>
+
+
+
+- Families
+
+<% Collection cols = htDesc.getFamilies();
+ if (cols.size() > 0) {
+ for (HColumnDescriptor hcd: htDesc.getFamilies()) { %>
+- Name: <%= hcd.getNameAsString() %>
+
+<% for (Map.Entry e: hcd.getValues().entrySet()) { %>
+- <%= Bytes.toString(e.getKey().get()).toLowerCase() %>: <%= Bytes.toString(e.getValue().get()).toLowerCase() %>
+<% } %>
+
+<% } %>
+
+<% } else { %>
+- none
+<% }%>
+
+
+
+- Indexes
+
+<% Collection idx = htDesc.getIndexes();
+ if (idx.size() > 0)
+ for (IndexSpecification is: idx) { %>
+- ID: <%= is.getIndexId() %>
+<% }
+ else { %>
+- none
+<% } %>
+
+
+
+
+
+
+
<% } %>
+
+
+
<%= tables.length %> table(s) in set.
<% } %>
@@ -83,7 +155,7 @@
%>
-| > | Address | Start Code | Load |
+ | Address | Start Code | Load |
<% String[] serverNames = serverToServerInfos.keySet().toArray(new String[serverToServerInfos.size()]);
Arrays.sort(serverNames);
for (String serverName: serverNames) {