Author: edwardyoon
Date: Thu Feb 20 01:55:49 2014
New Revision: 1570051
URL: http://svn.apache.org/r1570051
Log:
HAMA-873: Display counters of job on master's web page (Saisai Shao via
edwardyoon)
Modified:
hama/trunk/CHANGES.txt
hama/trunk/core/src/main/resources/webapp/bspmaster/bspjob.jsp
Modified: hama/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1570051&r1=1570050&r2=1570051&view=diff
==============================================================================
--- hama/trunk/CHANGES.txt (original)
+++ hama/trunk/CHANGES.txt Thu Feb 20 01:55:49 2014
@@ -3,7 +3,7 @@ Hama Change Log
Release 0.7.0 (unreleased changes)
NEW FEATURES
-
+
HAMA-864: Fix/improve DoubleVector and DenseDoubleVector (Yexi Jiang)
HAMA-842: Add persistent queue option to JobConf (edwardyoon)
HAMA-839: Support NullWritable in Hama Pipes (Martin Illecker)
@@ -30,6 +30,7 @@ Release 0.7.0 (unreleased changes)
IMPROVEMENTS
+ HAMA-873: Display counters of job on master's web page (Saisai Shao via
edwardyoon)
HAMA-870: Runtime message compression in Bundle (edwardyoon)
HAMA-869: Add Cloudera repository in maven pom file (Saisai Shao via
edwardyoon)
HAMA-856: Optimize BSPMessageBundle (edwardyoon)
Modified: hama/trunk/core/src/main/resources/webapp/bspmaster/bspjob.jsp
URL:
http://svn.apache.org/viewvc/hama/trunk/core/src/main/resources/webapp/bspmaster/bspjob.jsp?rev=1570051&r1=1570050&r2=1570051&view=diff
==============================================================================
--- hama/trunk/core/src/main/resources/webapp/bspmaster/bspjob.jsp (original)
+++ hama/trunk/core/src/main/resources/webapp/bspmaster/bspjob.jsp Thu Feb 20
01:55:49 2014
@@ -16,8 +16,8 @@
-->
<%@ page contentType="text/html; charset=UTF-8" import="javax.servlet.*"
import="javax.servlet.http.*" import="java.io.*" import="java.util.*"
- import="java.text.DecimalFormat" import="org.apache.hama.bsp.*"
- import="org.apache.hama.util.*"%>
+ import="java.text.DecimalFormat" import="java.text.Format"
import="org.apache.hama.bsp.*"
+ import="org.apache.hama.util.*"
import="org.apache.hadoop.http.HtmlQuoting"%>
<%!private static final long serialVersionUID = 1L;%>
<%
BSPMaster tracker = (BSPMaster) application
@@ -60,6 +60,48 @@
</table>
+ <br/> <br/>
+ <table border="1" cellpadding="6" cellspacing="0">
+ <tr>
+ <th><br/></th>
+ <th>Counter</th>
+ <th>Total</th>
+ </tr>
+ <%
+ Counters counters = status.getCounter();
+ if (counters == null) {
+ counters = new Counters();
+ }
+
+ for (String groupName : counters.getGroupNames()) {
+ Counters.Group group = counters.getGroup(groupName);
+
+ Format decimal = new DecimalFormat();
+
+ boolean isFirst = true;
+ for (Counters.Counter counter : group) {
+ String name = counter.getDisplayName();
+ String value = decimal.format(counter.getCounter());
+ %>
+ <tr>
+ <%
+ if (isFirst) {
+ isFirst = false;
+ %>
+ <td rowspan="<%=group.size()%>">
+ <%=HtmlQuoting.quoteHtmlChars(group.getDisplayName())%></td>
+ <%
+ }
+ %>
+ <td><%=HtmlQuoting.quoteHtmlChars(name)%></td>
+ <td align="right"><%=value%></td>
+ </tr>
+ <%
+ }
+ }
+ %>
+ </table>
+
<hr>
<a href="bspmaster.jsp">Back to BSPMaster</a>
