diff --git a/CHANGES.txt b/CHANGES.txt index ca723a779b6..ae9153d5eb9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -32,6 +32,7 @@ Trunk (unreleased changes) IMPROVEMENTS HADOOP-2401 Add convenience put method that takes writable (Johan Oskarsson via Stack) + HADOOP-2074 Simple switch to enable DEBUG level-logging in hbase HADOOP-2088 Make hbase runnable in $HADOOP_HOME/build(/contrib/hbase) HADOOP-2126 Use Bob Jenkins' hash for bloom filters HADOOP-2157 Make Scanners implement Iterable diff --git a/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java b/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java index 70192da0c77..b1b909bf7e2 100644 --- a/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java +++ b/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java @@ -52,9 +52,9 @@ public final class hql_jsp extends org.apache.jasper.runtime.HttpJspBase query = ""; } - out.write("\n
\n

\n \n \n

\n \n \n \n

\n
\n

Enter 'help;' -- thats 'help' plus a semi-colon -- for a list of HQL commands.\n Data Definition, SHELL, INSERTS, DELETES, and UPDATE commands are disabled in this interface\n

\n \n "); + out.write("\" />\n \n

\n \n

Enter 'help;' -- thats 'help' plus a semi-colon -- for the list of HQL commands.\n Data Definition, SHELL, INSERTS, DELETES, and UPDATE commands are disabled in this interface\n

\n \n "); if (query.length() > 0) { diff --git a/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java b/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java index b8962196dfd..b4b4378d0c9 100644 --- a/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java +++ b/src/java/org/apache/hadoop/hbase/generated/master/master_jsp.java @@ -63,16 +63,17 @@ public final class master_jsp extends org.apache.jasper.runtime.HttpJspBase Map onlineRegions = master.getOnlineMetaRegions(); Map serverToServerInfos = master.getServersToServerInfo(); + int interval = conf.getInt("hbase.regionserver.msginterval", 6000)/1000; out.write("\n \n\n\nHbase Master: "); out.print( master.getMasterAddress()); out.write("\n\n\n\n\n\n\"Hbase\n

Master: "); out.print(master.getMasterAddress()); - out.write("

\n\n
\n\n

Master Attributes

\n\n\n\n
Attribute NameValue
Filesystem"); + out.write("\n\n
\n\n

Master Attributes

\n\n\n\n\n\n
Attribute NameValueDescription
Filesystem"); out.print( conf.get("fs.default.name") ); - out.write("
Hbase Root Directory"); + out.write("Filesystem hbase is running on
Hbase Root Directory"); out.print( master.getRootDir().toString() ); - out.write("
\n\n

Online META Regions

\n"); + out.write("		Location of hbase home directory
\n\n

Online META Regions

\n"); if (rootLocation != null) { out.write("\n\n\n
NameServer
"); out.print( HConstants.ROOT_TABLE_NAME.toString() ); @@ -102,7 +103,7 @@ public final class master_jsp extends org.apache.jasper.runtime.HttpJspBase out.print(msg ); out.write("

\n\n

Region Servers

\n"); if (serverToServerInfos != null && serverToServerInfos.size() > 0) { - out.write("\n\n\n"); + out.write("\n
AddressStart CodeLoad
\n\n\n"); for (Map.Entry e: serverToServerInfos.entrySet()) { HServerInfo hsi = e.getValue(); String url = "http://" + @@ -123,7 +124,9 @@ public final class master_jsp extends org.apache.jasper.runtime.HttpJspBase out.print( load ); out.write("\n"); } - out.write("\n
AddressStart CodeLoad
\n"); + out.write("\n
\n

Load is requests per hbase.regionsserver.msginterval ("); + out.print(interval); + out.write(" second(s)) and count of regions loaded

\n"); } out.write("\n\n\n"); } catch (Throwable t) { diff --git a/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java b/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java index 25a4aa563ed..b6251a4919c 100644 --- a/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java +++ b/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java @@ -55,9 +55,9 @@ public final class regionserver_jsp extends org.apache.jasper.runtime.HttpJspBas out.print( serverInfo.getServerAddress().toString() ); out.write("\n\n\n\n\n\"Hbase\n

Region Server: "); out.print( serverInfo.getServerAddress().toString() ); - out.write("

\n\n
\n\n

Region Server Attributes

\n\n\n\n
Attribute NameValue
Load"); + out.write("\n\n
\n\n

Region Server Attributes

\n\n\n\n
Attribute NameValueDescription
Load"); out.print( serverInfo.getLoad().toString() ); - out.write("
\n\n

Online Regions

\n"); + out.write("		Requests/hbase.regionserver.msginterval + count of loaded regions
\n\n

Online Regions

\n"); if (onlineRegions != null && onlineRegions.size() > 0) { out.write("\n\n\n"); for (HRegion r: onlineRegions.values()) { diff --git a/src/java/org/apache/hadoop/hbase/util/InfoServer.java b/src/java/org/apache/hadoop/hbase/util/InfoServer.java index 01ff3f22226..3e1b3fb0a0b 100644 --- a/src/java/org/apache/hadoop/hbase/util/InfoServer.java +++ b/src/java/org/apache/hadoop/hbase/util/InfoServer.java @@ -99,6 +99,7 @@ public class InfoServer { this.webAppContext = this.webServer.addWebApplication("/", webappDir); addServlet("stacks", "/stacks", StatusHttpServer.StackServlet.class); + addServlet("logLevel", "/logLevel", org.apache.hadoop.log.LogLevel.Servlet.class); } /** @@ -226,4 +227,4 @@ public class InfoServer { public void stop() throws InterruptedException { this.webServer.stop(); } -} \ No newline at end of file +} diff --git a/src/webapps/master/master.jsp b/src/webapps/master/master.jsp index 2db71eca7cb..d9a19514c1d 100644 --- a/src/webapps/master/master.jsp +++ b/src/webapps/master/master.jsp @@ -22,6 +22,7 @@ Map onlineRegions = master.getOnlineMetaRegions(); Map serverToServerInfos = master.getServersToServerInfo(); + int interval = conf.getInt("hbase.regionserver.msginterval", 6000)/1000; %> @@ -35,14 +36,14 @@

Master: <%=master.getMasterAddress()%>

- +

Master Attributes

Region NameStart KeyEnd Key
- - - + + +
Attribute NameValue
Filesystem<%= conf.get("fs.default.name") %>
Hbase Root Directory<%= master.getRootDir().toString() %>
Attribute NameValueDescription
Filesystem<%= conf.get("fs.default.name") %>Filesystem hbase is running on
Hbase Root Directory<%= master.getRootDir().toString() %>Location of hbase home directory

Online META Regions

@@ -69,6 +70,7 @@ <% if (serverToServerInfos != null && serverToServerInfos.size() > 0) { %> + <% for (Map.Entry e: serverToServerInfos.entrySet()) { HServerInfo hsi = e.getValue(); String url = "http://" + @@ -81,6 +83,7 @@ <% } %>
AddressStart CodeLoad
<%= address %><%= startCode %><%= load %>
+

Load is requests per hbase.regionsserver.msginterval (<%=interval%> second(s)) and count of regions loaded

<% } %> diff --git a/src/webapps/regionserver/regionserver.jsp b/src/webapps/regionserver/regionserver.jsp index d3fada5a29e..b616c1185cf 100644 --- a/src/webapps/regionserver/regionserver.jsp +++ b/src/webapps/regionserver/regionserver.jsp @@ -21,13 +21,13 @@

Region Server: <%= serverInfo.getServerAddress().toString() %>

- +

Region Server Attributes

- - + +
Attribute NameValue
Load<%= serverInfo.getLoad().toString() %>
Attribute NameValueDescription
Load<%= serverInfo.getLoad().toString() %>Requests/hbase.regionserver.msginterval + count of loaded regions

Online Regions