Author: tomwhite
Date: Fri Oct 26 20:55:57 2012
New Revision: 1402657
URL: http://svn.apache.org/viewvc?rev=1402657&view=rev
Log:
YARN-145. Add a Web UI to the fair share scheduler. Contributed by Sandy Ryza.
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java
(with props)
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java
(with props)
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerInfo.java
(with props)
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerQueueInfo.java
(with props)
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerApp.java
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1402657&r1=1402656&r2=1402657&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Fri Oct 26 20:55:57 2012
@@ -23,6 +23,8 @@ Release 2.0.3-alpha - Unreleased
NEW FEATURES
+ YARN-145. Add a Web UI to the fair share scheduler. (Sandy Ryza via
tomwhite)
+
IMPROVEMENTS
YARN-78. Changed UnManagedAM application to use YarnClient. (Bikas Saha via
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java?rev=1402657&r1=1402656&r2=1402657&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSQueue.java
Fri Oct 26 20:55:57 2012
@@ -56,7 +56,9 @@ public class FSQueue {
public void addApp(FSSchedulerApp app) {
applications.add(app);
- queueSchedulable.addApp(new AppSchedulable(scheduler, app, this));
+ AppSchedulable appSchedulable = new AppSchedulable(scheduler, app, this);
+ app.setAppSchedulable(appSchedulable);
+ queueSchedulable.addApp(appSchedulable);
}
public void removeJob(FSSchedulerApp app) {
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerApp.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerApp.java?rev=1402657&r1=1402656&r2=1402657&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerApp.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSSchedulerApp.java
Fri Oct 26 20:55:57 2012
@@ -70,6 +70,7 @@ public class FSSchedulerApp extends Sche
.getRecordFactory(null);
private final AppSchedulingInfo appSchedulingInfo;
+ private AppSchedulable appSchedulable;
private final Queue queue;
private final Resource currentConsumption = recordFactory
@@ -118,6 +119,14 @@ public class FSSchedulerApp extends Sche
public ApplicationAttemptId getApplicationAttemptId() {
return this.appSchedulingInfo.getApplicationAttemptId();
}
+
+ public void setAppSchedulable(AppSchedulable appSchedulable) {
+ this.appSchedulable = appSchedulable;
+ }
+
+ public AppSchedulable getAppSchedulable() {
+ return appSchedulable;
+ }
public String getUser() {
return this.appSchedulingInfo.getUser();
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java?rev=1402657&r1=1402656&r2=1402657&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
Fri Oct 26 20:55:57 2012
@@ -788,7 +788,11 @@ public class FairScheduler implements Re
FSSchedulerNode node = nodes.get(nodeId);
return node == null ? null : new SchedulerNodeReport(node);
}
-
+
+ public FSSchedulerApp getSchedulerApp(ApplicationAttemptId appAttemptId) {
+ return applications.get(appAttemptId);
+ }
+
@Override
public SchedulerAppReport getSchedulerAppInfo(
ApplicationAttemptId appAttemptId) {
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java?rev=1402657&r1=1402656&r2=1402657&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java
Fri Oct 26 20:55:57 2012
@@ -446,7 +446,7 @@ public class QueueManager {
* Get the maximum resource allocation for the given queue.
* @return the cap set on this queue, or Integer.MAX_VALUE if not set.
*/
- Resource getMaxResources(String queueName) {
+ public Resource getMaxResources(String queueName) {
synchronized (maxQueueResourcesMO) {
if (maxQueueResources.containsKey(queueName)) {
return maxQueueResources.get(queueName);
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java?rev=1402657&view=auto
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java
(added)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java
Fri Oct 26 20:55:57 2012
@@ -0,0 +1,136 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.hadoop.yarn.server.resourcemanager.webapp;
+
+import static org.apache.hadoop.yarn.util.StringHelper.join;
+import static org.apache.hadoop.yarn.webapp.YarnWebParams.APP_STATE;
+import static org.apache.hadoop.yarn.webapp.view.JQueryUI._PROGRESSBAR;
+import static org.apache.hadoop.yarn.webapp.view.JQueryUI._PROGRESSBAR_VALUE;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+import
org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerInfo;
+import org.apache.hadoop.yarn.util.Times;
+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.view.HtmlBlock;
+import org.apache.hadoop.yarn.webapp.view.JQueryUI.Render;
+
+import com.google.inject.Inject;
+
+/**
+ * Shows application information specific to the fair
+ * scheduler as part of the fair scheduler page.
+ */
+public class FairSchedulerAppsBlock extends HtmlBlock {
+ final AppsList list;
+ final FairSchedulerInfo fsinfo;
+
+ @Inject public FairSchedulerAppsBlock(AppsList list,
+ ResourceManager rm, ViewContext ctx) {
+ super(ctx);
+ this.list = list;
+ FairScheduler scheduler = (FairScheduler) rm.getResourceScheduler();
+ fsinfo = new FairSchedulerInfo(scheduler);
+ }
+
+ @Override public void render(Block html) {
+ TBODY<TABLE<Hamlet>> tbody = html.
+ table("#apps").
+ thead().
+ tr().
+ th(".id", "ID").
+ th(".user", "User").
+ th(".name", "Name").
+ th(".queue", "Queue").
+ th(".fairshare", "Fair Share").
+ th(".starttime", "StartTime").
+ th(".finishtime", "FinishTime").
+ th(".state", "State").
+ th(".finalstatus", "FinalStatus").
+ th(".progress", "Progress").
+ th(".ui", "Tracking UI")._()._().
+ tbody();
+ int i = 0;
+ Collection<RMAppState> reqAppStates = null;
+ String reqStateString = $(APP_STATE);
+ if (reqStateString != null && !reqStateString.isEmpty()) {
+ String[] appStateStrings = reqStateString.split(",");
+ reqAppStates = new HashSet<RMAppState>(appStateStrings.length);
+ for(String stateString : appStateStrings) {
+ reqAppStates.add(RMAppState.valueOf(stateString));
+ }
+ }
+ for (RMApp app : list.apps.values()) {
+ if (reqAppStates != null && !reqAppStates.contains(app.getState())) {
+ continue;
+ }
+ AppInfo appInfo = new AppInfo(app, true);
+ String percent = String.format("%.1f", appInfo.getProgress());
+ String startTime = Times.format(appInfo.getStartTime());
+ String finishTime = Times.format(appInfo.getFinishTime());
+ ApplicationAttemptId attemptId =
app.getCurrentAppAttempt().getAppAttemptId();
+ int fairShare = fsinfo.getAppFairShare(attemptId);
+
+ tbody.
+ tr().
+ td().
+ br().$title(appInfo.getAppIdNum())._(). // for sorting
+ a(url("app", appInfo.getAppId()), appInfo.getAppId())._().
+ td(appInfo.getUser()).
+ td(appInfo.getName()).
+ td(appInfo.getQueue()).
+ td("" + fairShare).
+ td().
+ br().$title(String.valueOf(appInfo.getStartTime()))._().
+ _(startTime)._().
+ td().
+ br().$title(String.valueOf(appInfo.getFinishTime()))._().
+ _(finishTime)._().
+ td(appInfo.getState()).
+ td(appInfo.getFinalStatus()).
+ td().
+ br().$title(percent)._(). // for sorting
+ div(_PROGRESSBAR).
+ $title(join(percent, '%')). // tooltip
+ div(_PROGRESSBAR_VALUE).
+ $style(join("width:", percent, '%'))._()._()._().
+ td().
+ a(!appInfo.isTrackingUrlReady()?
+ "#" : appInfo.getTrackingUrlPretty(),
appInfo.getTrackingUI())._()._();
+ if (list.rendering != Render.HTML && ++i >= 20) break;
+ }
+ tbody._()._();
+
+ if (list.rendering == Render.JS_ARRAY) {
+ echo("<script type='text/javascript'>\n",
+ "var appsData=");
+ list.toDataTableArrays(reqAppStates, writer());
+ echo("\n</script>\n");
+ }
+ }
+}
Propchange:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java?rev=1402657&view=auto
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java
(added)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java
Fri Oct 26 20:55:57 2012
@@ -0,0 +1,200 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.webapp;
+
+import static org.apache.hadoop.yarn.util.StringHelper.join;
+
+import java.util.List;
+
+import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerInfo;
+import
org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerQueueInfo;
+import org.apache.hadoop.yarn.webapp.ResponseInfo;
+import org.apache.hadoop.yarn.webapp.SubView;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.UL;
+import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
+import org.apache.hadoop.yarn.webapp.view.InfoBlock;
+
+import com.google.inject.Inject;
+import com.google.inject.servlet.RequestScoped;
+
+public class FairSchedulerPage extends RmView {
+ static final String _Q = ".ui-state-default.ui-corner-all";
+ static final float Q_MAX_WIDTH = 0.8f;
+ static final float Q_STATS_POS = Q_MAX_WIDTH + 0.05f;
+ static final String Q_END = "left:101%";
+ static final String Q_GIVEN = "left:0%;background:none;border:1px dashed
rgba(0,0,0,0.25)";
+ static final String Q_OVER = "background:rgba(255, 140, 0, 0.8)";
+ static final String Q_UNDER = "background:rgba(50, 205, 50, 0.8)";
+
+ @RequestScoped
+ static class FSQInfo {
+ FairSchedulerInfo fsinfo;
+ FairSchedulerQueueInfo qinfo;
+ }
+
+ static class QueueInfoBlock extends HtmlBlock {
+ final FairSchedulerQueueInfo qinfo;
+
+ @Inject QueueInfoBlock(ViewContext ctx, FSQInfo info) {
+ super(ctx);
+ qinfo = (FairSchedulerQueueInfo) info.qinfo;
+ }
+
+ @Override
+ protected void render(Block html) {
+ ResponseInfo ri = info("\'" + qinfo.getQueueName() + "\' Queue Status").
+ _("Used Resources:", qinfo.getUsedResources().toString()).
+ _("Num Active Applications:", qinfo.getNumActiveApplications()).
+ _("Num Pending Applications:", qinfo.getNumPendingApplications()).
+ _("Min Resources:", qinfo.getMinResources().toString()).
+ _("Max Resources:", qinfo.getMaxResources().toString());
+ int maxApps = qinfo.getMaxApplications();
+ if (maxApps < Integer.MAX_VALUE) {
+ ri._("Max Running Applications:", qinfo.getMaxApplications());
+ }
+ ri._("Fair Share:", qinfo.getFairShare());
+
+ html._(InfoBlock.class);
+
+ // clear the info contents so this queue's info doesn't accumulate into
another queue's info
+ ri.clear();
+ }
+ }
+
+ static class QueuesBlock extends HtmlBlock {
+ final FairScheduler fs;
+ final FSQInfo fsqinfo;
+
+ @Inject QueuesBlock(ResourceManager rm, FSQInfo info) {
+ fs = (FairScheduler)rm.getResourceScheduler();
+ fsqinfo = info;
+ }
+
+ @Override public void render(Block html) {
+ html._(MetricsOverviewTable.class);
+ UL<DIV<DIV<Hamlet>>> ul = html.
+ div("#cs-wrapper.ui-widget").
+ div(".ui-widget-header.ui-corner-top").
+ _("Application Queues")._().
+ div("#cs.ui-widget-content.ui-corner-bottom").
+ ul();
+ if (fs == null) {
+ ul.
+ li().
+ a(_Q).$style(width(Q_MAX_WIDTH)).
+ span().$style(Q_END)._("100% ")._().
+ span(".q", "default")._()._();
+ } else {
+ FairSchedulerInfo sinfo = new FairSchedulerInfo(fs);
+ fsqinfo.fsinfo = sinfo;
+ fsqinfo.qinfo = null;
+
+ ul.
+ li().$style("margin-bottom: 1em").
+ span().$style("font-weight: bold")._("Legend:")._().
+ span().$class("qlegend ui-corner-all").$style(Q_GIVEN).
+ _("Fair Share")._().
+ span().$class("qlegend ui-corner-all").$style(Q_UNDER).
+ _("Used")._().
+ span().$class("qlegend ui-corner-all").$style(Q_OVER).
+ _("Used (over fair share)")._().
+ span().$class("qlegend ui-corner-all ui-state-default").
+ _("Max Capacity")._().
+ _();
+
+ List<FairSchedulerQueueInfo> subQueues =
fsqinfo.fsinfo.getQueueInfos();
+ for (FairSchedulerQueueInfo info : subQueues) {
+ fsqinfo.qinfo = info;
+ float capacity = info.getMaxResourcesFraction();
+ float fairShare = info.getFairShareFraction();
+ float used = info.getUsedFraction();
+ ul.
+ li().
+ a(_Q).$style(width(capacity * Q_MAX_WIDTH)).
+ $title(join("Fair Share:", percent(fairShare))).
+ span().$style(join(Q_GIVEN, ";font-size:1px;",
width(fairShare/capacity))).
+ _('.')._().
+ span().$style(join(width(used/capacity),
+ ";font-size:1px;left:0%;", used > fairShare ? Q_OVER :
Q_UNDER)).
+ _('.')._().
+ span(".q", info.getQueueName())._().
+ span().$class("qstats").$style(left(Q_STATS_POS)).
+ _(join(percent(used), " used"))._().
+ ul("#lq").li()._(QueueInfoBlock.class)._()._().
+ _();
+ }
+ }
+ ul._()._().
+ script().$type("text/javascript").
+ _("$('#cs').hide();")._()._().
+ _(FairSchedulerAppsBlock.class);
+ }
+ }
+
+ @Override protected void postHead(Page.HTML<_> html) {
+ html.
+ style().$type("text/css").
+ _("#cs { padding: 0.5em 0 1em 0; margin-bottom: 1em; position:
relative }",
+ "#cs ul { list-style: none }",
+ "#cs a { font-weight: normal; margin: 2px; position: relative }",
+ "#cs a span { font-weight: normal; font-size: 80% }",
+ "#cs-wrapper .ui-widget-header { padding: 0.2em 0.5em }",
+ "table.info tr th {width: 50%}")._(). // to center info table
+ script("/static/jt/jquery.jstree.js").
+ script().$type("text/javascript").
+ _("$(function() {",
+ " $('#cs a span').addClass('ui-corner-all').css('position',
'absolute');",
+ " $('#cs').bind('loaded.jstree', function (e, data) {",
+ " data.inst.open_all(); }).",
+ " jstree({",
+ " core: { animation: 188, html_titles: true },",
+ " plugins: ['themeroller', 'html_data', 'ui'],",
+ " themeroller: { item_open: 'ui-icon-minus',",
+ " item_clsd: 'ui-icon-plus', item_leaf: 'ui-icon-gear'",
+ " }",
+ " });",
+ " $('#cs').bind('select_node.jstree', function(e, data) {",
+ " var q = $('.q', data.rslt.obj).first().text();",
+ " if (q == 'root') q = '';",
+ " $('#apps').dataTable().fnFilter(q, 3);",
+ " });",
+ " $('#cs').show();",
+ "});")._();
+ }
+
+ @Override protected Class<? extends SubView> content() {
+ return QueuesBlock.class;
+ }
+
+ static String percent(float f) {
+ return String.format("%.1f%%", f * 100);
+ }
+
+ static String width(float f) {
+ return String.format("width:%.1f%%", f * 100);
+ }
+
+ static String left(float f) {
+ return String.format("left:%.1f%%", f * 100);
+ }
+}
Propchange:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java?rev=1402657&r1=1402656&r2=1402657&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RmController.java
Fri Oct 26 20:55:57 2012
@@ -77,8 +77,9 @@ public class RmController extends Contro
}
if (rs instanceof FairScheduler) {
- context().setStatus(404);
- throw new WebAppException("Fair Scheduler UI not yet supported");
+ setTitle("Fair Scheduler");
+ render(FairSchedulerPage.class);
+ return;
}
setTitle("Default Scheduler");
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerInfo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerInfo.java?rev=1402657&view=auto
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerInfo.java
(added)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerInfo.java
Fri Oct 26 20:55:57 2012
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+
+public class FairSchedulerInfo {
+ private List<FairSchedulerQueueInfo> queueInfos;
+ private FairScheduler scheduler;
+
+ public FairSchedulerInfo(FairScheduler fs) {
+ scheduler = fs;
+ Collection<FSQueue> queues = fs.getQueueManager().getQueues();
+ queueInfos = new ArrayList<FairSchedulerQueueInfo>();
+ for (FSQueue queue : queues) {
+ queueInfos.add(new FairSchedulerQueueInfo(queue, fs));
+ }
+ }
+
+ public List<FairSchedulerQueueInfo> getQueueInfos() {
+ return queueInfos;
+ }
+
+ public int getAppFairShare(ApplicationAttemptId appAttemptId) {
+ return scheduler.getSchedulerApp(appAttemptId).
+ getAppSchedulable().getFairShare().getMemory();
+ }
+}
Propchange:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerQueueInfo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerQueueInfo.java?rev=1402657&view=auto
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerQueueInfo.java
(added)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerQueueInfo.java
Fri Oct 26 20:55:57 2012
@@ -0,0 +1,153 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.yarn.server.resourcemanager.webapp.dao;
+
+import java.util.Collection;
+
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.server.resourcemanager.resource.Resources;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueueSchedulable;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSSchedulerApp;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueueManager;
+
+public class FairSchedulerQueueInfo {
+ private int numPendingApps;
+ private int numActiveApps;
+
+ private int fairShare;
+ private int minShare;
+ private int maxShare;
+ private int clusterMaxMem;
+
+ private int maxApps;
+
+ private float fractionUsed;
+ private float fractionFairShare;
+ private float fractionMinShare;
+
+ private Resource minResources;
+ private Resource maxResources;
+ private Resource usedResources;
+
+ private String queueName;
+
+ public FairSchedulerQueueInfo(FSQueue queue, FairScheduler scheduler) {
+ Collection<FSSchedulerApp> apps = queue.getApplications();
+ for (FSSchedulerApp app : apps) {
+ if (app.isPending()) {
+ numPendingApps++;
+ } else {
+ numActiveApps++;
+ }
+ }
+
+ FSQueueSchedulable schedulable = queue.getQueueSchedulable();
+ QueueManager manager = scheduler.getQueueManager();
+
+ queueName = queue.getName();
+
+ Resource clusterMax = scheduler.getClusterCapacity();
+ clusterMaxMem = clusterMax.getMemory();
+
+ usedResources = schedulable.getResourceUsage();
+ fractionUsed = (float)usedResources.getMemory() / clusterMaxMem;
+
+ fairShare = schedulable.getFairShare().getMemory();
+ minResources = schedulable.getMinShare();
+ minShare = minResources.getMemory();
+ maxResources = scheduler.getQueueManager().getMaxResources(queueName);
+ if (maxResources.getMemory() > clusterMaxMem) {
+ maxResources = Resources.createResource(clusterMaxMem);
+ }
+ maxShare = maxResources.getMemory();
+
+ fractionFairShare = (float)fairShare / clusterMaxMem;
+ fractionMinShare = (float)minShare / clusterMaxMem;
+
+ maxApps = manager.getQueueMaxApps(queueName);
+ }
+
+ /**
+ * Returns the fair share as a fraction of the entire cluster capacity.
+ */
+ public float getFairShareFraction() {
+ return fractionFairShare;
+ }
+
+ /**
+ * Returns the fair share of this queue in megabytes.
+ */
+ public int getFairShare() {
+ return fairShare;
+ }
+
+ public int getNumActiveApplications() {
+ return numPendingApps;
+ }
+
+ public int getNumPendingApplications() {
+ return numActiveApps;
+ }
+
+ public Resource getMinResources() {
+ return minResources;
+ }
+
+ public Resource getMaxResources() {
+ return maxResources;
+ }
+
+ public int getMaxApplications() {
+ return maxApps;
+ }
+
+ public String getQueueName() {
+ return queueName;
+ }
+
+ public Resource getUsedResources() {
+ return usedResources;
+ }
+
+ /**
+ * Returns the queue's min share in as a fraction of the entire
+ * cluster capacity.
+ */
+ public float getMinShareFraction() {
+ return fractionMinShare;
+ }
+
+ /**
+ * Returns the memory used by this queue as a fraction of the entire
+ * cluster capacity.
+ */
+ public float getUsedFraction() {
+ return fractionUsed;
+ }
+
+ /**
+ * Returns the capacity of this queue as a fraction of the entire cluster
+ * capacity.
+ */
+ public float getMaxResourcesFraction() {
+ return (float)maxShare / clusterMaxMem;
+ }
+}
Propchange:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerQueueInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
