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:
parent
1ea39ddc3c
commit
1fca6cfe03
|
@ -283,6 +283,10 @@ Release 0.23.3 - UNRELEASED
|
|||
MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented
|
||||
(Devaraj K via bobby)
|
||||
|
||||
MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves
|
||||
via bobby)
|
||||
|
||||
|
||||
Release 0.23.2 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -66,7 +66,8 @@ public class TaskPage extends AppView {
|
|||
th(".id", "Attempt").
|
||||
th(".progress", "Progress").
|
||||
th(".state", "State").
|
||||
th(".node", "node").
|
||||
th(".node", "Node").
|
||||
th(".logs", "Logs").
|
||||
th(".tsh", "Started").
|
||||
th(".tsh", "Finished").
|
||||
th(".tsh", "Elapsed").
|
||||
|
@ -83,24 +84,28 @@ public class TaskPage extends AppView {
|
|||
long finishTime = ta.getFinishTime();
|
||||
long elapsed = ta.getElapsedTime();
|
||||
String diag = ta.getNote() == null ? "" : ta.getNote();
|
||||
TD<TR<TBODY<TABLE<Hamlet>>>> nodeTd = tbody.
|
||||
tr().
|
||||
td(".id", taid).
|
||||
td(".progress", progress).
|
||||
td(".state", ta.getState()).td();
|
||||
TR<TBODY<TABLE<Hamlet>>> row = tbody.tr();
|
||||
TD<TR<TBODY<TABLE<Hamlet>>>> nodeTd = row.
|
||||
td(".id", taid).
|
||||
td(".progress", progress).
|
||||
td(".state", ta.getState()).td();
|
||||
if (nodeHttpAddr == null) {
|
||||
nodeTd._("N/A");
|
||||
} else {
|
||||
nodeTd.
|
||||
a(".nodelink", url("http://", nodeHttpAddr), nodeHttpAddr);
|
||||
}
|
||||
nodeTd._();
|
||||
if (containerId != null) {
|
||||
String containerIdStr = ta.getAssignedContainerIdStr();
|
||||
nodeTd._(" ").
|
||||
row.td().
|
||||
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(finishTime)).
|
||||
td(".dt", StringUtils.formatTime(elapsed)).
|
||||
|
|
|
@ -89,7 +89,8 @@ public class HsTaskPage extends HsView {
|
|||
headRow.
|
||||
th(".id", "Attempt").
|
||||
th(".state", "State").
|
||||
th(".node", "node").
|
||||
th(".node", "Node").
|
||||
th(".logs", "Logs").
|
||||
th(".tsh", "Start Time");
|
||||
|
||||
if(type == TaskType.REDUCE) {
|
||||
|
@ -144,10 +145,11 @@ public class HsTaskPage extends HsView {
|
|||
_(taid)._().td(ta.getState().toString()).td().a(".nodelink",
|
||||
"http://"+ nodeHttpAddr,
|
||||
nodeRackName + "/" + nodeHttpAddr);
|
||||
td._(" ").a(".logslink",
|
||||
url("logs", nodeIdString, containerIdString, taid, app.getJob()
|
||||
.getUserName()), "logs");
|
||||
td._();
|
||||
row.td().
|
||||
a(".logslink",
|
||||
url("logs", nodeIdString, containerIdString, taid, app.getJob()
|
||||
.getUserName()), "logs")._();
|
||||
|
||||
row.td().
|
||||
br().$title(String.valueOf(attemptStartTime))._().
|
||||
|
@ -195,6 +197,8 @@ public class HsTaskPage extends HsView {
|
|||
$name("attempt_state").$value("State")._()._().
|
||||
th().input("search_init").$type(InputType.text).
|
||||
$name("attempt_node").$value("Node")._()._().
|
||||
th().input("search_init").$type(InputType.text).
|
||||
$name("attempt_node").$value("Logs")._()._().
|
||||
th().input("search_init").$type(InputType.text).
|
||||
$name("attempt_start_time").$value("Start Time")._()._();
|
||||
|
||||
|
|
Loading…
Reference in New Issue