Repository: hadoop Updated Branches: refs/heads/branch-2 66419d367 -> 2a0149554
YARN-3888. ApplicationMaster link is broken in RM WebUI when appstate is NEW. Contributed by Bibin A Chundatt (cherry picked from commit 52148767924baf423172d26f2c6d8a4cfc6e143f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2a014955 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2a014955 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2a014955 Branch: refs/heads/branch-2 Commit: 2a014955448be279568842a68e3c36b847882609 Parents: 66419d3 Author: Xuan <[email protected]> Authored: Thu Jul 9 21:37:33 2015 -0700 Committer: Xuan <[email protected]> Committed: Thu Jul 9 21:38:46 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/webapp/RMAppsBlock.java | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a014955/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 8508070..2331b67 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -559,6 +559,9 @@ Release 2.8.0 - UNRELEASED YARN-3892. Fixed NPE on RMStateStore#serviceStop when CapacityScheduler#serviceInit fails. (Bibin A Chundatt via jianhe) + YARN-3888. ApplicationMaster link is broken in RM WebUI when appstate is NEW. + (Bibin A Chundatt via xgong) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a014955/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.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/RMAppsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java index d252c30..5e80d23 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMAppsBlock.java @@ -131,13 +131,15 @@ public class RMAppsBlock extends AppsBlock { String trackingURL = app.getTrackingUrl() == null - || app.getTrackingUrl().equals(UNAVAILABLE) ? null : app - .getTrackingUrl(); + || app.getTrackingUrl().equals(UNAVAILABLE) + || app.getAppState() == YarnApplicationState.NEW ? null : app + .getTrackingUrl(); String trackingUI = app.getTrackingUrl() == null - || app.getTrackingUrl().equals(UNAVAILABLE) ? "Unassigned" : app - .getAppState() == YarnApplicationState.FINISHED + || app.getTrackingUrl().equals(UNAVAILABLE) + || app.getAppState() == YarnApplicationState.NEW ? "Unassigned" + : app.getAppState() == YarnApplicationState.FINISHED || app.getAppState() == YarnApplicationState.FAILED || app.getAppState() == YarnApplicationState.KILLED ? "History" : "ApplicationMaster";
