commit 0d18926ce93c3a06a664987cad0c80c845edd523
Author: liyintang
Date: 2 weeks ago
HBASE-4418 Show all the hbase configuration in the web ui
diff --git a/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon b/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
index abeb850..85a4473 100644
--- a/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -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;
Local logs,
Thread Dump,
Log Level,
- Debug dump
+ Debug dump,
+<%if HBaseConfiguration.isShowConfInServlet()%>
+ HBase Configuration
+%if>
diff --git a/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
index be6fceb..5fb0aae 100644
--- a/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
+++ b/src/main/jamon/org/apache/hbase/tmpl/regionserver/RSStatusTmpl.jamon
@@ -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;
Local logs,
Thread Dump,
Log Level,
- Debug dump
+ Debug dump,
+<%if HBaseConfiguration.isShowConfInServlet() %>
+ HBase Configuration
+%if>
diff --git a/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java b/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index d5197fe..9507a61 100644
--- a/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -124,4 +124,20 @@ public class HBaseConfiguration extends Configuration {
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;
+ }
}
diff --git a/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java b/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
index d204eab..5529745 100644
--- a/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
@@ -57,7 +57,7 @@ public class InfoServer extends HttpServer {
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();
}