Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-04-23 19:39:43 +00:00
parent 1ea39ddc3c
commit 1fca6cfe03
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-mapreduce-project/CHANGES.txt
View File

@ -283,6 +283,10 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented
(Devaraj K via bobby) (Devaraj K via bobby)
MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves
via bobby)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

17
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
View File

@ -66,7 +66,8 @@ public class TaskPage extends AppView {
th(".id", "Attempt"). th(".id", "Attempt").
th(".progress", "Progress"). th(".progress", "Progress").
th(".state", "State"). th(".state", "State").
th(".node", "node"). th(".node", "Node").
th(".logs", "Logs").
th(".tsh", "Started"). th(".tsh", "Started").
th(".tsh", "Finished"). th(".tsh", "Finished").
th(".tsh", "Elapsed"). th(".tsh", "Elapsed").
@ -83,8 +84,8 @@ public class TaskPage extends AppView {
long finishTime = ta.getFinishTime(); long finishTime = ta.getFinishTime();
long elapsed = ta.getElapsedTime(); long elapsed = ta.getElapsedTime();
String diag = ta.getNote() == null ? "" : ta.getNote(); String diag = ta.getNote() == null ? "" : ta.getNote();
TD<TR<TBODY<TABLE<Hamlet>>>> nodeTd = tbody. TR<TBODY<TABLE<Hamlet>>> row = tbody.tr();
tr(). TD<TR<TBODY<TABLE<Hamlet>>>> nodeTd = row.
td(".id", taid). td(".id", taid).
td(".progress", progress). td(".progress", progress).
td(".state", ta.getState()).td(); td(".state", ta.getState()).td();
@ -94,13 +95,17 @@ public class TaskPage extends AppView {
nodeTd. nodeTd.
a(".nodelink", url("http://", nodeHttpAddr), nodeHttpAddr); a(".nodelink", url("http://", nodeHttpAddr), nodeHttpAddr);
} }
nodeTd._();
if (containerId != null) { if (containerId != null) {
String containerIdStr = ta.getAssignedContainerIdStr(); String containerIdStr = ta.getAssignedContainerIdStr();
nodeTd._(" "). row.td().
a(".logslink", url("http://", nodeHttpAddr, "node", "containerlogs", a(".logslink", url("http://", nodeHttpAddr, "node", "containerlogs",
containerIdStr, app.getJob().getUserName()), "logs"); containerIdStr, app.getJob().getUserName()), "logs")._();
} else {
row.td()._("N/A")._();
} }
nodeTd._().
row.
td(".ts", Times.format(startTime)). td(".ts", Times.format(startTime)).
td(".ts", Times.format(finishTime)). td(".ts", Times.format(finishTime)).
td(".dt", StringUtils.formatTime(elapsed)). td(".dt", StringUtils.formatTime(elapsed)).

12
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTaskPage.java
View File

@ -89,7 +89,8 @@ public class HsTaskPage extends HsView {
headRow. headRow.
th(".id", "Attempt"). th(".id", "Attempt").
th(".state", "State"). th(".state", "State").
th(".node", "node"). th(".node", "Node").
th(".logs", "Logs").
th(".tsh", "Start Time"); th(".tsh", "Start Time");
if(type == TaskType.REDUCE) { if(type == TaskType.REDUCE) {
@ -144,10 +145,11 @@ public class HsTaskPage extends HsView {
_(taid)._().td(ta.getState().toString()).td().a(".nodelink", _(taid)._().td(ta.getState().toString()).td().a(".nodelink",
"http://"+ nodeHttpAddr, "http://"+ nodeHttpAddr,
nodeRackName + "/" + nodeHttpAddr); nodeRackName + "/" + nodeHttpAddr);
td._(" ").a(".logslink",
url("logs", nodeIdString, containerIdString, taid, app.getJob()
.getUserName()), "logs");
td._(); td._();
row.td().
a(".logslink",
url("logs", nodeIdString, containerIdString, taid, app.getJob()
.getUserName()), "logs")._();
row.td(). row.td().
br().$title(String.valueOf(attemptStartTime))._(). br().$title(String.valueOf(attemptStartTime))._().
@ -195,6 +197,8 @@ public class HsTaskPage extends HsView {
$name("attempt_state").$value("State")._()._(). $name("attempt_state").$value("State")._()._().
th().input("search_init").$type(InputType.text). th().input("search_init").$type(InputType.text).
$name("attempt_node").$value("Node")._()._(). $name("attempt_node").$value("Node")._()._().
th().input("search_init").$type(InputType.text).
$name("attempt_node").$value("Logs")._()._().
th().input("search_init").$type(InputType.text). th().input("search_init").$type(InputType.text).
$name("attempt_start_time").$value("Start Time")._()._(); $name("attempt_start_time").$value("Start Time")._()._();