Repository: hadoop Updated Branches: refs/heads/trunk de0f1700c -> b2e6cf607
YARN-3404. Display queue name on application page. Contributed by Ryu Kobayashi Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b2e6cf60 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b2e6cf60 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b2e6cf60 Branch: refs/heads/trunk Commit: b2e6cf607f1712d103520ca6b3ff21ecc07cd265 Parents: de0f170 Author: Jian He <jia...@apache.org> Authored: Wed Apr 15 13:52:50 2015 -0700 Committer: Jian He <jia...@apache.org> Committed: Wed Apr 15 13:52:50 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/yarn/server/webapp/AppBlock.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2e6cf60/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 4a29b77..7ec4b50 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -131,6 +131,8 @@ Release 2.8.0 - UNRELEASED YARN-3394. Enrich WebApplication proxy documentation. (Naganarasimha G R via jianhe) + YARN-3404. Display queue name on application page. (Ryu Kobayashi via jianhe) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not http://git-wip-us.apache.org/repos/asf/hadoop/blob/b2e6cf60/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java index d5a3dd8..0d80339 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java @@ -54,6 +54,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -157,8 +158,11 @@ public class AppBlock extends HtmlBlock { html.script().$type("text/javascript")._(script.toString())._(); } + String schedulerPath = WebAppUtils.getResolvedRMWebAppURLWithScheme(conf) + + "/cluster/scheduler?openQueues=" + app.getQueue(); + ResponseInfo overviewTable = info("Application Overview") - ._("User:", app.getUser()) + ._("User:", schedulerPath, app.getUser()) ._("Name:", app.getName()) ._("Application Type:", app.getType()) ._("Application Tags:", @@ -167,6 +171,7 @@ public class AppBlock extends HtmlBlock { "YarnApplicationState:", app.getAppState() == null ? UNAVAILABLE : clarifyAppState(app .getAppState())) + ._("Queue:", schedulerPath, app.getQueue()) ._("FinalStatus Reported by AM:", clairfyAppFinalStatus(app.getFinalAppStatus())) ._("Started:", Times.format(app.getStartedTime()))
