Author: larsgeorge
Date: Wed Apr 14 23:06:45 2010
New Revision: 934237
URL: http://svn.apache.org/viewvc?rev=934237&view=rev
Log:
HBASE-2430 Disable frag display in trunk, let HBASE-2165 replace it
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/core/src/main/resources/webapps/master/master.jsp
hadoop/hbase/trunk/core/src/main/resources/webapps/master/table.jsp
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=934237&r1=934236&r2=934237&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Apr 14 23:06:45 2010
@@ -505,6 +505,7 @@ Release 0.21.0 - Unreleased
(Kay Kay via Stack)
HBASE-2440 Master UI should check against known bad JDK versions and
warn the user (Todd Lipcon via Stack)
+ HBASE-2430 Disable frag display in trunk, let HBASE-2165 replace it
NEW FEATURES
HBASE-1961 HBase EC2 scripts
Modified: hadoop/hbase/trunk/core/src/main/resources/webapps/master/master.jsp
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/resources/webapps/master/master.jsp?rev=934237&r1=934236&r2=934237&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/resources/webapps/master/master.jsp
(original)
+++ hadoop/hbase/trunk/core/src/main/resources/webapps/master/master.jsp Wed
Apr 14 23:06:45 2010
@@ -1,20 +1,14 @@
<%@ page contentType="text/html;charset=UTF-8"
import="java.util.*"
- import="java.net.URLEncoder"
import="org.apache.hadoop.conf.Configuration"
- import="org.apache.hadoop.io.Text"
import="org.apache.hadoop.hbase.util.Bytes"
import="org.apache.hadoop.hbase.util.JvmVersion"
- import="org.apache.hadoop.hbase.util.FSUtils"
import="org.apache.hadoop.hbase.master.HMaster"
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.HTableDescriptor" %><%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
@@ -26,7 +20,11 @@
if (interval == 0) {
interval = 1;
}
- Map<String, Integer> frags = master.getTableFragmentation();
+ boolean showFragmentation =
conf.getBoolean("hbase.master.ui.fragmentation.enabled", false);
+ Map<String, Integer> frags = null;
+ if (showFragmentation) {
+ frags = master.getTableFragmentation();
+ }
%><?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -61,7 +59,9 @@
<tr><td>HBase Root Directory</td><td><%= master.getRootDir().toString()
%></td><td>Location of HBase home directory</td></tr>
<tr><td>Load average</td><td><%= master.getServerManager().getAverageLoad()
%></td><td>Average number of regions per regionserver. Naive
computation.</td></tr>
<tr><td>Regions On FS</td><td><%= master.getRegionManager().countRegionsOnFS()
%></td><td>Number of regions on FileSystem. Rough count.</td></tr>
-<tr><td>Fragmentation</td><td><%= frags.get("-TOTAL-") != null ?
frags.get("-TOTAL-").intValue() + "%" : "n/a" %></td><td>Overall fragmentation
of all tables, including .META. and -ROOT-.</td></tr>
+<% if (showFragmentation) { %>
+ <tr><td>Fragmentation</td><td><%= frags.get("-TOTAL-") != null ?
frags.get("-TOTAL-").intValue() + "%" : "n/a" %></td><td>Overall fragmentation
of all tables, including .META. and -ROOT-.</td></tr>
+<% } %>
<tr><td>Zookeeper Quorum</td><td><%=
master.getZooKeeperWrapper().getQuorumServers() %></td><td>Addresses of all
registered ZK servers. For more, see <a href="/zk.jsp">zk dump</a>.</td></tr>
</table>
@@ -69,16 +69,28 @@
<%
if (rootLocation != null) { %>
<table>
-<tr><th>Table</th><th title="Fragmentation - Will be 0% after a major
compaction and fluctuate during normal
usage.">Frag.</th><th>Description</th></tr>
-<tr><td><a href="/table.jsp?name=<%=
Bytes.toString(HConstants.ROOT_TABLE_NAME) %>"><%=
Bytes.toString(HConstants.ROOT_TABLE_NAME) %></a></td>
-<td align="center"><%= frags.get("-ROOT-") != null ?
frags.get("-ROOT-").intValue() + "%" : "n/a" %></td>
-<td>The -ROOT- table holds references to all .META. regions.</td>
+<tr>
+ <th>Table</th>
+<% if (showFragmentation) { %>
+ <th title="Fragmentation - Will be 0% after a major compaction and
fluctuate during normal usage.">Frag.</th>
+<% } %>
+ <th>Description</th>
+</tr>
+<tr>
+ <td><a href="/table.jsp?name=<%=
Bytes.toString(HConstants.ROOT_TABLE_NAME) %>"><%=
Bytes.toString(HConstants.ROOT_TABLE_NAME) %></a></td>
+<% if (showFragmentation) { %>
+ <td align="center"><%= frags.get("-ROOT-") != null ?
frags.get("-ROOT-").intValue() + "%" : "n/a" %></td>
+<% } %>
+ <td>The -ROOT- table holds references to all .META. regions.</td>
</tr>
<%
if (onlineRegions != null && onlineRegions.size() > 0) { %>
-<tr><td><a href="/table.jsp?name=<%=
Bytes.toString(HConstants.META_TABLE_NAME) %>"><%=
Bytes.toString(HConstants.META_TABLE_NAME) %></a></td>
-<td align="center"><%= frags.get(".META.") != null ?
frags.get(".META.").intValue() + "%" : "n/a" %></td>
-<td>The .META. table holds references to all User Table regions</td>
+<tr>
+ <td><a href="/table.jsp?name=<%=
Bytes.toString(HConstants.META_TABLE_NAME) %>"><%=
Bytes.toString(HConstants.META_TABLE_NAME) %></a></td>
+<% if (showFragmentation) { %>
+ <td align="center"><%= frags.get(".META.") != null ?
frags.get(".META.").intValue() + "%" : "n/a" %></td>
+<% } %>
+ <td>The .META. table holds references to all User Table regions</td>
</tr>
<% } %>
@@ -89,11 +101,20 @@
<% HTableDescriptor[] tables = new HBaseAdmin(conf).listTables();
if(tables != null && tables.length > 0) { %>
<table>
-<tr><th>Table</th><th title="Fragmentation - Will be 0% after a major
compaction and fluctuate during normal
usage.">Frag.</th><th>Description</th></tr>
+<tr>
+ <th>Table</th>
+<% if (showFragmentation) { %>
+ <th title="Fragmentation - Will be 0% after a major compaction and
fluctuate during normal usage.">Frag.</th>
+<% } %>
+ <th>Description</th>
+</tr>
<% for(HTableDescriptor htDesc : tables ) { %>
-<tr><td><a href=/table.jsp?name=<%= htDesc.getNameAsString() %>><%=
htDesc.getNameAsString() %></a> </td>
-<td align="center"><%= frags.get(htDesc.getNameAsString()) != null ?
frags.get(htDesc.getNameAsString()).intValue() + "%" : "n/a" %></td>
-<td><%= htDesc.toString() %></td>
+<tr>
+ <td><a href=/table.jsp?name=<%= htDesc.getNameAsString() %>><%=
htDesc.getNameAsString() %></a> </td>
+<% if (showFragmentation) { %>
+ <td align="center"><%= frags.get(htDesc.getNameAsString()) != null ?
frags.get(htDesc.getNameAsString()).intValue() + "%" : "n/a" %></td>
+<% } %>
+ <td><%= htDesc.toString() %></td>
</tr>
<% } %>
Modified: hadoop/hbase/trunk/core/src/main/resources/webapps/master/table.jsp
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/resources/webapps/master/table.jsp?rev=934237&r1=934236&r2=934237&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/resources/webapps/master/table.jsp
(original)
+++ hadoop/hbase/trunk/core/src/main/resources/webapps/master/table.jsp Wed Apr
14 23:06:45 2010
@@ -1,22 +1,16 @@
<%@ page contentType="text/html;charset=UTF-8"
- import="java.io.IOException"
import="java.util.Map"
- import="java.net.URLEncoder"
- import="org.apache.hadoop.io.Text"
import="org.apache.hadoop.io.Writable"
import="org.apache.hadoop.conf.Configuration"
- import="org.apache.hadoop.hbase.HTableDescriptor"
import="org.apache.hadoop.hbase.client.HTable"
import="org.apache.hadoop.hbase.client.HBaseAdmin"
import="org.apache.hadoop.hbase.HRegionInfo"
import="org.apache.hadoop.hbase.HServerAddress"
import="org.apache.hadoop.hbase.HServerInfo"
- import="org.apache.hadoop.hbase.HBaseConfiguration"
import="org.apache.hadoop.hbase.io.ImmutableBytesWritable"
import="org.apache.hadoop.hbase.master.HMaster"
import="org.apache.hadoop.hbase.master.MetaRegion"
import="org.apache.hadoop.hbase.util.Bytes"
- import="java.io.IOException"
import="java.util.Map"
import="org.apache.hadoop.hbase.HConstants"%><%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
@@ -28,7 +22,11 @@
master.getServerManager().getServerAddressToServerInfo();
String tableHeader = "<h2>Table
Regions</h2><table><tr><th>Name</th><th>Region Server</th><th>Encoded
Name</th><th>Start Key</th><th>End Key</th></tr>";
HServerAddress rootLocation =
master.getRegionManager().getRootRegionLocation();
- Map<String, Integer> frags = master.getTableFragmentation();
+ boolean showFragmentation =
conf.getBoolean("hbase.master.ui.fragmentation.enabled", false);
+ Map<String, Integer> frags = null;
+ if (showFragmentation) {
+ frags = master.getTableFragmentation();
+ }
%>
<?xml version="1.0" encoding="UTF-8" ?>
@@ -120,9 +118,22 @@
try { %>
<h2>Table Attributes</h2>
<table>
- <tr><th>Attribute Name</th><th>Value</th><th>Description</th></tr>
- <tr><td>Enabled</td><td><%= hbadmin.isTableEnabled(table.getTableName())
%></td><td>Is the table enabled</td></tr>
- <tr><td>Fragmentation</td><td><%= frags.get(tableName) != null ?
frags.get(tableName).intValue() + "%" : "n/a" %></td><td>How fragmented is the
table. After a major compaction it is 0%.</td></tr>
+ <tr>
+ <th>Attribute Name</th>
+ <th>Value</th>
+ <th>Description</th></tr>
+ <tr>
+ <td>Enabled</td>
+ <td><%= hbadmin.isTableEnabled(table.getTableName()) %></td>
+ <td>Is the table enabled</td>
+ </tr>
+<% if (showFragmentation) { %>
+ <tr>
+ <td>Fragmentation</td>
+ <td><%= frags.get(tableName) != null ? frags.get(tableName).intValue() +
"%" : "n/a" %></td>
+ <td>How fragmented is the table. After a major compaction it is 0%.</td>
+ </tr>
+<% } %>
</table>
<%
Map<HRegionInfo, HServerAddress> regions = table.getRegionsInfo();
