Author: sseth
Date: Thu Apr 12 18:41:09 2012
New Revision: 1325436
URL: http://svn.apache.org/viewvc?rev=1325436&view=rev
Log:
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)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1325436&r1=1325435&r2=1325436&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu
Apr 12 18:41:09 2012
@@ -224,6 +224,10 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4140. mapreduce classes incorrectly importing
"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
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java?rev=1325436&r1=1325435&r2=1325436&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/TaskPage.java
Thu Apr 12 18:41:09 2012
@@ -87,9 +87,13 @@ public class TaskPage extends AppView {
tr().
td(".id", taid).
td(".progress", progress).
- td(".state", ta.getState()).
- td().
- a(".nodelink", url("http://";, nodeHttpAddr), nodeHttpAddr);
+ td(".state", ta.getState()).td();
+ if (nodeHttpAddr == null) {
+ nodeTd._("N/A");
+ } else {
+ nodeTd.
+ a(".nodelink", url("http://";, nodeHttpAddr), nodeHttpAddr);
+ }
if (containerId != null) {
String containerIdStr = ta.getAssignedContainerIdStr();
nodeTd._(" ").
