Repository: hadoop Updated Branches: refs/heads/trunk bcf289050 -> 5d708a472
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/5d708a47 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d708a47 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d708a47 Branch: refs/heads/trunk Commit: 5d708a4725529cf09d2dd8b5b4aa3542cc8610b0 Parents: bcf2890 Author: Thomas Graves <tgra...@apache.org> Authored: Fri May 8 16:35:40 2015 +0000 Committer: Thomas Graves <tgra...@apache.org> Committed: Fri May 8 16:35:40 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/5d708a47/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7f6a09f..b72c648 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d708a47/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:",