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

Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Siddharth Seth 2012-04-12 18:41:09 +00:00
parent cca655f4ab
commit d550503dbb
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,10 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4140. mapreduce classes incorrectly importing MAPREDUCE-4140. mapreduce classes incorrectly importing
"clover.org.apache.*" classes. (Patrick Hunt via tomwhite) "clover.org.apache.*" classes. (Patrick Hunt via tomwhite)
MAPREDUCE-4050. For tasks without assigned containers, changes the node
text on the UI to N/A instead of a link to null. (Bhallamudi Venkata Siva
Kamesh via sseth)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -87,9 +87,13 @@ public class TaskPage extends AppView {
tr(). tr().
td(".id", taid). td(".id", taid).
td(".progress", progress). td(".progress", progress).
td(".state", ta.getState()). td(".state", ta.getState()).td();
td(). if (nodeHttpAddr == null) {
a(".nodelink", url("http://", nodeHttpAddr), nodeHttpAddr); nodeTd._("N/A");
} else {
nodeTd.
a(".nodelink", url("http://", nodeHttpAddr), nodeHttpAddr);
}
if (containerId != null) { if (containerId != null) {
String containerIdStr = ta.getAssignedContainerIdStr(); String containerIdStr = ta.getAssignedContainerIdStr();
nodeTd._(" "). nodeTd._(" ").