You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/05/09 02:42:04 UTC

[10/50] hadoop git commit: YARN-3600. AM container link is broken (Naganarasimha G R via tgraves

YARN-3600. AM container link is broken (Naganarasimha G R via tgraves


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/758b6d42
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/758b6d42
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/758b6d42

Branch: refs/heads/YARN-2928
Commit: 758b6d425c65b2bd2921a95f5acaf6c90984c9fc
Parents: 5e3981a
Author: Thomas Graves <tg...@apache.org>
Authored: Fri May 8 16:35:40 2015 +0000
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:32:47 2015 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                 | 2 ++
 .../yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/758b6d42/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 31f4581..effaf80 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -423,6 +423,8 @@ Release 2.8.0 - UNRELEASED
 
     YARN-3589. RM and AH web UI display DOCTYPE wrongly. (Rohith via ozawa)
 
+    YARN-3600. AM container link is broken (Naganarasimha G R via tgraves)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/758b6d42/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java
index 30f55be..34ad08a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppAttemptBlock.java
@@ -229,8 +229,9 @@ public class RMAppAttemptBlock extends AppAttemptBlock{
         "AM Container:",
         appAttempt.getAmContainerId() == null || containers == null
             || !hasAMContainer(appAttemptReport.getAMContainerId(), containers)
-            ? "N/A" : root_url("container", appAttempt.getAmContainerId()),
-        String.valueOf(appAttempt.getAmContainerId()))
+            ? null : root_url("container", appAttempt.getAmContainerId()),
+        appAttempt.getAmContainerId() == null ? "N/A" :
+          String.valueOf(appAttempt.getAmContainerId()))
       ._("Node:", node)
       ._(
         "Tracking URL:",