From 5d708a4725529cf09d2dd8b5b4aa3542cc8610b0 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Fri, 8 May 2015 16:35:40 +0000 Subject: [PATCH] YARN-3600. AM container link is broken (Naganarasimha G R via tgraves --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../server/resourcemanager/webapp/RMAppAttemptBlock.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7f6a09f2491..b72c648bc1a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -353,6 +353,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 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 30f55bee502..34ad08a8dfd 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:",