You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/18 23:05:15 UTC
svn commit: r1185859 - in /hbase/trunk: ./
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/java/org/apache/hadoop/hbase/util/
Author: nspiegelberg
Date: Tue Oct 18 21:05:14 2011
New Revision: 1185859
URL: http://svn.apache.org/viewvc?rev=1185859&view=rev
Log:
HBASE-4418 Show all the hbase configuration in the web ui
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1185859&r1=1185858&r2=1185859&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Oct 18 21:05:14 2011
@@ -16,6 +16,7 @@ Release 0.93.0 - Unreleased
CacheConf class (jgray)
HBASE-4102 atomicAppend: A put that appends to the latest version of a cell (Lars H)
HBASE-4469 Avoid top row seek by looking up bloomfilter (liyin via jgray)
+ HBASE-4418 Show all the hbase configuration in the web ui
BUG FIXES
HBASE-4488 Store could miss rows during flush (Lars H via jgray)
Modified: hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1185859&r1=1185858&r2=1185859&view=diff
==============================================================================
--- hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon Tue Oct 18 21:05:14 2011
@@ -42,6 +42,7 @@ org.apache.hadoop.hbase.ServerName;
org.apache.hadoop.hbase.client.HBaseAdmin;
org.apache.hadoop.hbase.client.HConnectionManager;
org.apache.hadoop.hbase.HTableDescriptor;
+org.apache.hadoop.hbase.HBaseConfiguration;
</%import>
<%if format.equals("json") %>
<& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
@@ -62,7 +63,10 @@ org.apache.hadoop.hbase.HTableDescriptor
<a href="/logs/">Local logs</a>,
<a href="/stacks">Thread Dump</a>,
<a href="/logLevel">Log Level</a>,
- <a href="/dump">Debug dump</a>
+ <a href="/dump">Debug dump</a>,
+<%if HBaseConfiguration.isShowConfInServlet()%>
+ <a href="/conf">HBase Configuration</a>
+</%if>
</p>
<!-- Various warnings that cluster admins should be aware of -->
Modified: hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1185859&r1=1185858&r2=1185859&view=diff
==============================================================================
--- hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon (original)
+++ hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon Tue Oct 18 21:05:14 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.HBaseConfiguration;
</%import>
<%if format.equals("json") %>
<& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
@@ -66,7 +67,10 @@ org.apache.hadoop.hbase.HRegionInfo;
<a href="/logs/">Local logs</a>,
<a href="/stacks">Thread Dump</a>,
<a href="/logLevel">Log Level</a>,
- <a href="/dump">Debug dump</a>
+ <a href="/dump">Debug dump</a>,
+<%if HBaseConfiguration.isShowConfInServlet() %>
+ <a href="/conf">HBase Configuration</a>
+</%if>
</p>
<hr id="head_rule" />
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java?rev=1185859&r1=1185858&r2=1185859&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java Tue Oct 18 21:05:14 2011
@@ -122,4 +122,20 @@ public class HBaseConfiguration extends
destConf.set(e.getKey(), e.getValue());
}
}
+
+ /**
+ *
+ * @return whether to show HBase Configuration in servlet
+ */
+ public static boolean isShowConfInServlet() {
+ boolean isShowConf = false;
+ try {
+ if (Class.forName("org.apache.hadoop.conf.ConfServlet") != null) {
+ isShowConf = true;
+ }
+ } catch (Exception e) {
+
+ }
+ return isShowConf;
+ }
}
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java?rev=1185859&r1=1185858&r2=1185859&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java Tue Oct 18 21:05:14 2011
@@ -57,7 +57,7 @@ public class InfoServer extends HttpServ
public InfoServer(String name, String bindAddress, int port, boolean findPort,
final Configuration c)
throws IOException {
- super(name, bindAddress, port, findPort, HBaseConfiguration.create());
+ super(name, bindAddress, port, findPort, c);
this.config = c;
fixupLogsServletLocation();
}