hadoop git commit: YARN-3404. Display queue name on application page. Contributed by Ryu Kobayashi (cherry picked from commit b2e6cf607f1712d103520ca6b3ff21ecc07cd265)

2016-02-12 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 a30043ca2 -> 81f892705


YARN-3404. Display queue name on application page. Contributed by Ryu Kobayashi
(cherry picked from commit b2e6cf607f1712d103520ca6b3ff21ecc07cd265)

Conflicts:


hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java


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

Branch: refs/heads/branch-2.7
Commit: 81f8927050460aeff9a341db5b5b5698622f4d0f
Parents: a30043c
Author: Jason Lowe 
Authored: Fri Feb 12 18:59:51 2016 +
Committer: Jason Lowe 
Committed: Fri Feb 12 18:59:51 2016 +

--
 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/81f89270/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 448920a..3cc5bbb 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -13,6 +13,8 @@ Release 2.7.3 - UNRELEASED
 YARN-4492. Add documentation for preemption supported in Capacity
 scheduler (Naganarasimha G R via jlowe)
 
+YARN-3404. Display queue name on application page. (Ryu Kobayashi via 
jianhe)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/81f89270/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 93697d0..bb9506f 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
@@ -50,6 +50,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;
 
@@ -153,8 +154,11 @@ public class AppBlock extends HtmlBlock {
   html.script().$type("text/javascript")._(script.toString())._();
 }
 
+String schedulerPath = WebAppUtils.getResolvedRMWebAppURLWithScheme(conf) +
+"/cluster/scheduler?openQueues=" + app.getQueue();
+
 info("Application Overview")
-  ._("User:", app.getUser())
+  ._("User:", schedulerPath, app.getUser())
   ._("Name:", app.getName())
   ._("Application Type:", app.getType())
   ._("Application Tags:",
@@ -163,6 +167,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()))

hadoop git commit: YARN-3404. Display queue name on application page. Contributed by Ryu Kobayashi (cherry picked from commit b2e6cf607f1712d103520ca6b3ff21ecc07cd265)

2015-04-15 Thread jianhe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 6d183561f - 58f99b740


YARN-3404. Display queue name on application page. Contributed by Ryu Kobayashi
(cherry picked from commit b2e6cf607f1712d103520ca6b3ff21ecc07cd265)


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

Branch: refs/heads/branch-2
Commit: 58f99b740afeaffa1ec46ec9fd7fee3b53399e9e
Parents: 6d18356
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:53:24 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/58f99b74/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ebeb7c2..06b7d75 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -83,6 +83,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/58f99b74/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()))