diff --git a/CHANGES.txt b/CHANGES.txt index 779431e0e22..bc0fa6d5235 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -53,6 +53,7 @@ Trunk (unreleased changes) command. HADOOP-2262 HADOOP-2261 fail fast on non-existing table, change abort to function after commit even if commit was successful + HADOOP-2257 Show a total of all requests and regions on the web ui Release 0.15.1 Branch 0.15 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 b4b4378d0c9..6b2f53e6aed 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 @@ -103,13 +103,21 @@ public final class master_jsp extends org.apache.jasper.runtime.HttpJspBase out.print(msg ); out.write("
\n\nAddress | Start Code | Load |
---|
Address | Start Code | Load | "); out.print( load ); - out.write("\n"); + out.write(" | \n"); } - out.write("\n
---|
Load is requests per hbase.regionsserver.msginterval ("); + out.write("\n
Load is requests per hbase.regionsserver.msginterval ("); out.print(interval); out.write(" second(s)) and count of regions loaded
\n"); } diff --git a/src/webapps/master/master.jsp b/src/webapps/master/master.jsp index d9a19514c1d..269ddc83dd7 100644 --- a/src/webapps/master/master.jsp +++ b/src/webapps/master/master.jsp @@ -68,8 +68,12 @@Address | Start Code | Load | |
---|---|---|---|
> | Address | Start Code | Load |
<%= address %> | <%= startCode %> | <%= load %> | |
<%= address %> | <%= startCode %> | <%= load %> | |
Total: | servers: <%= serverToServerInfos.size() %> | requests: <%= totalRequests %> regions: <%= totalRegions %> |
Load is requests per hbase.regionsserver.msginterval (<%=interval%> second(s)) and count of regions loaded
<% } %>