hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tgra...@apache.org
Subject hadoop git commit: YARN-3600. AM container link is broken (Naganarasimha G R via tgraves (cherry picked from commit 5d708a4725529cf09d2dd8b5b4aa3542cc8610b0)
Date Fri, 08 May 2015 16:38:16 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 28e0593b9 -> 547b06988


YARN-3600. AM container link is broken (Naganarasimha G R via tgraves
(cherry picked from commit 5d708a4725529cf09d2dd8b5b4aa3542cc8610b0)


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

Branch: refs/heads/branch-2
Commit: 547b0698873334bf0bb50a54e41bd45b6c326d06
Parents: 28e0593
Author: Thomas Graves <tgraves@apache.org>
Authored: Fri May 8 16:35:40 2015 +0000
Committer: Thomas Graves <tgraves@apache.org>
Committed: Fri May 8 16:37:20 2015 +0000

----------------------------------------------------------------------
 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/547b0698/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 5ae87ef..25625b7 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -308,6 +308,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/547b0698/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:",


Mime
View raw message