http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMErrorsAndWarningsPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMErrorsAndWarningsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMErrorsAndWarningsPage.java index 7475c4d..5e81ed5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMErrorsAndWarningsPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMErrorsAndWarningsPage.java @@ -32,7 +32,7 @@ public class NMErrorsAndWarningsPage extends NMView { } @Override - protected void preHead(HtmlPage.Page.HTML<HtmlPage._> html) { + protected void preHead(HtmlPage.Page.HTML<__> html) { commonPreHead(html); String title = "Errors and Warnings in the NodeManager"; setTitle(title);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMView.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMView.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMView.java index dc21b4a..a76d2ef 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMView.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NMView.java @@ -27,11 +27,11 @@ import org.apache.hadoop.yarn.webapp.view.TwoColumnLayout; public class NMView extends TwoColumnLayout { - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); } - protected void commonPreHead(Page.HTML<_> html) { + protected void commonPreHead(Page.HTML<__> html) { set(ACCORDION_ID, "nav"); set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}"); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java index 857a4f9..0a2731e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NavBlock.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.util.Log4jWarningErrorMetricsAppender; import org.apache.hadoop.yarn.webapp.YarnWebParams; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; @@ -55,29 +55,29 @@ public class NavBlock extends HtmlBlock implements YarnWebParams { WebAppUtils.getResolvedRMWebAppURLWithScheme(this.conf); Hamlet.UL<Hamlet.DIV<Hamlet>> ul = html .div("#nav") - .h3()._("ResourceManager")._() + .h3().__("ResourceManager").__() .ul() - .li().a(RMWebAppURL, "RM Home")._()._() - .h3()._("NodeManager")._() // TODO: Problem if no header like this + .li().a(RMWebAppURL, "RM Home").__().__() + .h3().__("NodeManager").__() // TODO: Problem if no header like this .ul() .li() - .a(url("node"), "Node Information")._() + .a(url("node"), "Node Information").__() .li() .a(url("allApplications"), "List of Applications") - ._() + .__() .li() - .a(url("allContainers"), "List of Containers")._() - ._() + .a(url("allContainers"), "List of Containers").__() + .__() .h3("Tools") .ul() - .li().a("/conf", "Configuration")._() - .li().a("/logs", "Local logs")._() - .li().a("/stacks", "Server stacks")._() - .li().a("/jmx?qry=Hadoop:*", "Server metrics")._(); + .li().a("/conf", "Configuration").__() + .li().a("/logs", "Local logs").__() + .li().a("/stacks", "Server stacks").__() + .li().a("/jmx?qry=Hadoop:*", "Server metrics").__(); if (addErrorsAndWarningsLink) { - ul.li().a(url("errors-and-warnings"), "Errors/Warnings")._(); + ul.li().a(url("errors-and-warnings"), "Errors/Warnings").__(); } - ul._()._(); + ul.__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java index f51f0c5..7005f41 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java @@ -28,7 +28,7 @@ import org.apache.hadoop.yarn.server.nodemanager.Context; import org.apache.hadoop.yarn.server.nodemanager.ResourceView; import org.apache.hadoop.yarn.server.nodemanager.webapp.dao.NodeInfo; import org.apache.hadoop.yarn.webapp.SubView; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.HTML; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.HTML; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -39,7 +39,7 @@ public class NodePage extends NMView { private static final long BYTES_IN_MB = 1024 * 1024; @Override - protected void commonPreHead(HTML<_> html) { + protected void commonPreHead(HTML<__> html) { super.commonPreHead(html); set(initID(ACCORDION, "nav"), "{autoHeight:false, active:1}"); @@ -65,29 +65,29 @@ public class NodePage extends NMView { protected void render(Block html) { NodeInfo info = new NodeInfo(this.context, this.resourceView); info("NodeManager information") - ._("Total Vmem allocated for Containers", + .__("Total Vmem allocated for Containers", StringUtils.byteDesc(info.getTotalVmemAllocated() * BYTES_IN_MB)) - ._("Vmem enforcement enabled", + .__("Vmem enforcement enabled", info.isVmemCheckEnabled()) - ._("Total Pmem allocated for Container", + .__("Total Pmem allocated for Container", StringUtils.byteDesc(info.getTotalPmemAllocated() * BYTES_IN_MB)) - ._("Pmem enforcement enabled", + .__("Pmem enforcement enabled", info.isPmemCheckEnabled()) - ._("Total VCores allocated for Containers", + .__("Total VCores allocated for Containers", String.valueOf(info.getTotalVCoresAllocated())) - ._("NodeHealthyStatus", + .__("NodeHealthyStatus", info.getHealthStatus()) - ._("LastNodeHealthTime", new Date( + .__("LastNodeHealthTime", new Date( info.getLastNodeUpdateTime())) - ._("NodeHealthReport", + .__("NodeHealthReport", info.getHealthReport()) - ._("NodeManager started on", new Date( + .__("NodeManager started on", new Date( info.getNMStartupTime())) - ._("NodeManager Version:", info.getNMBuildVersion() + + .__("NodeManager Version:", info.getNMBuildVersion() + " on " + info.getNMVersionBuiltOn()) - ._("Hadoop Version:", info.getHadoopBuildVersion() + + .__("Hadoop Version:", info.getHadoopBuildVersion() + " on " + info.getHadoopVersionBuiltOn()); - html._(InfoBlock.class); + html.__(InfoBlock.class); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutBlock.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/AboutBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutBlock.java index 4225afd..b7ce105 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutBlock.java @@ -37,22 +37,22 @@ public class AboutBlock extends HtmlBlock { @Override protected void render(Block html) { - html._(MetricsOverviewTable.class); + html.__(MetricsOverviewTable.class); ResourceManager rm = getInstance(ResourceManager.class); ClusterInfo cinfo = new ClusterInfo(rm); info("Cluster overview"). - _("Cluster ID:", cinfo.getClusterId()). - _("ResourceManager state:", cinfo.getState()). - _("ResourceManager HA state:", cinfo.getHAState()). - _("ResourceManager HA zookeeper connection state:", + __("Cluster ID:", cinfo.getClusterId()). + __("ResourceManager state:", cinfo.getState()). + __("ResourceManager HA state:", cinfo.getHAState()). + __("ResourceManager HA zookeeper connection state:", cinfo.getHAZookeeperConnectionState()). - _("ResourceManager RMStateStore:", cinfo.getRMStateStore()). - _("ResourceManager started on:", Times.format(cinfo.getStartedOn())). - _("ResourceManager version:", cinfo.getRMBuildVersion() + + __("ResourceManager RMStateStore:", cinfo.getRMStateStore()). + __("ResourceManager started on:", Times.format(cinfo.getStartedOn())). + __("ResourceManager version:", cinfo.getRMBuildVersion() + " on " + cinfo.getRMVersionBuiltOn()). - _("Hadoop version:", cinfo.getHadoopBuildVersion() + + __("Hadoop version:", cinfo.getHadoopBuildVersion() + " on " + cinfo.getHadoopVersionBuiltOn()); - html._(InfoBlock.class); + html.__(InfoBlock.class); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutPage.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/AboutPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutPage.java index ef0fdcf..f8c0406 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AboutPage.java @@ -22,7 +22,7 @@ import org.apache.hadoop.yarn.webapp.SubView; public class AboutPage extends RmView { - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.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/AppAttemptPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.java index 45f1887..89e2dec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppAttemptPage.java @@ -31,7 +31,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; public class AppAttemptPage extends RmView { @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String appAttemptId = $(YarnWebParams.APPLICATION_ATTEMPT_ID); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppLogAggregationStatusPage.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/AppLogAggregationStatusPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppLogAggregationStatusPage.java index ccb53dd..27fb43a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppLogAggregationStatusPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppLogAggregationStatusPage.java @@ -25,7 +25,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; public class AppLogAggregationStatusPage extends RmView{ @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String appId = $(YarnWebParams.APPLICATION_ID); set( http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.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/AppPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java index 0c5516a..7036f33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppPage.java @@ -30,7 +30,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; public class AppPage extends RmView { @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String appId = $(YarnWebParams.APPLICATION_ID); set( http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlockWithMetrics.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/AppsBlockWithMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlockWithMetrics.java index 29889ec..fac100f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlockWithMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsBlockWithMetrics.java @@ -18,7 +18,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import org.apache.hadoop.yarn.server.webapp.AppsBlock; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; /** @@ -26,7 +25,7 @@ import org.apache.hadoop.yarn.webapp.view.HtmlBlock; */ class AppsBlockWithMetrics extends HtmlBlock { @Override public void render(Block html) { - html._(MetricsOverviewTable.class); - html._(RMAppsBlock.class); + html.__(MetricsOverviewTable.class); + html.__(RMAppsBlock.class); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.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/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index 292c5f3..f3ab5b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -47,12 +47,12 @@ import org.apache.hadoop.yarn.util.Times; import org.apache.hadoop.yarn.util.resource.Resources; 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.LI; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TBODY; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.UL; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.LI; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.UL; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -105,7 +105,7 @@ class CapacitySchedulerPage extends RmView { info("\'" + lqinfo.getQueuePath().substring(5) + "\' Queue Status for Partition \'" + nodeLabelDisplay + "\'"); renderQueueCapacityInfo(ri, nodeLabel); - html._(InfoBlock.class); + html.__(InfoBlock.class); // clear the info contents so this queue's info doesn't accumulate into // another queue's info ri.clear(); @@ -113,10 +113,10 @@ class CapacitySchedulerPage extends RmView { // second display the queue specific details : ri = info("\'" + lqinfo.getQueuePath().substring(5) + "\' Queue Status") - ._("Queue State:", lqinfo.getQueueState()); + .__("Queue State:", lqinfo.getQueueState()); renderCommonLeafQueueInfo(ri); - html._(InfoBlock.class); + html.__(InfoBlock.class); // clear the info contents so this queue's info doesn't accumulate into // another queue's info ri.clear(); @@ -125,10 +125,10 @@ class CapacitySchedulerPage extends RmView { private void renderLeafQueueInfoWithoutParition(Block html) { ResponseInfo ri = info("\'" + lqinfo.getQueuePath().substring(5) + "\' Queue Status") - ._("Queue State:", lqinfo.getQueueState()); + .__("Queue State:", lqinfo.getQueueState()); renderQueueCapacityInfo(ri, ""); renderCommonLeafQueueInfo(ri); - html._(InfoBlock.class); + html.__(InfoBlock.class); // clear the info contents so this queue's info doesn't accumulate into // another queue's info ri.clear(); @@ -155,40 +155,40 @@ class CapacitySchedulerPage extends RmView { ? new ResourceInfo(Resources.none()) : resourceUsages.getAmUsed(); ri. - _("Used Capacity:", percent(capacities.getUsedCapacity() / 100)). - _("Configured Capacity:", percent(capacities.getCapacity() / 100)). - _("Configured Max Capacity:", percent(capacities.getMaxCapacity() / 100)). - _("Absolute Used Capacity:", percent(capacities.getAbsoluteUsedCapacity() / 100)). - _("Absolute Configured Capacity:", percent(capacities.getAbsoluteCapacity() / 100)). - _("Absolute Configured Max Capacity:", percent(capacities.getAbsoluteMaxCapacity() / 100)). - _("Used Resources:", resourceUsages.getUsed().toString()). - _("Configured Max Application Master Limit:", StringUtils.format("%.1f", + __("Used Capacity:", percent(capacities.getUsedCapacity() / 100)). + __("Configured Capacity:", percent(capacities.getCapacity() / 100)). + __("Configured Max Capacity:", percent(capacities.getMaxCapacity() / 100)). + __("Absolute Used Capacity:", percent(capacities.getAbsoluteUsedCapacity() / 100)). + __("Absolute Configured Capacity:", percent(capacities.getAbsoluteCapacity() / 100)). + __("Absolute Configured Max Capacity:", percent(capacities.getAbsoluteMaxCapacity() / 100)). + __("Used Resources:", resourceUsages.getUsed().toString()). + __("Configured Max Application Master Limit:", StringUtils.format("%.1f", capacities.getMaxAMLimitPercentage())). - _("Max Application Master Resources:", + __("Max Application Master Resources:", resourceUsages.getAMLimit().toString()). - _("Used Application Master Resources:", + __("Used Application Master Resources:", amUsed.toString()). - _("Max Application Master Resources Per User:", + __("Max Application Master Resources Per User:", userAMResourceLimit.toString()); } private void renderCommonLeafQueueInfo(ResponseInfo ri) { ri. - _("Num Schedulable Applications:", Integer.toString(lqinfo.getNumActiveApplications())). - _("Num Non-Schedulable Applications:", Integer.toString(lqinfo.getNumPendingApplications())). - _("Num Containers:", Integer.toString(lqinfo.getNumContainers())). - _("Max Applications:", Integer.toString(lqinfo.getMaxApplications())). - _("Max Applications Per User:", Integer.toString(lqinfo.getMaxApplicationsPerUser())). - _("Configured Minimum User Limit Percent:", Integer.toString(lqinfo.getUserLimit()) + "%"). - _("Configured User Limit Factor:", lqinfo.getUserLimitFactor()). - _("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels())). - _("Ordering Policy: ", lqinfo.getOrderingPolicyInfo()). - _("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"). - _("Default Node Label Expression:", + __("Num Schedulable Applications:", Integer.toString(lqinfo.getNumActiveApplications())). + __("Num Non-Schedulable Applications:", Integer.toString(lqinfo.getNumPendingApplications())). + __("Num Containers:", Integer.toString(lqinfo.getNumContainers())). + __("Max Applications:", Integer.toString(lqinfo.getMaxApplications())). + __("Max Applications Per User:", Integer.toString(lqinfo.getMaxApplicationsPerUser())). + __("Configured Minimum User Limit Percent:", Integer.toString(lqinfo.getUserLimit()) + "%"). + __("Configured User Limit Factor:", lqinfo.getUserLimitFactor()). + __("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels())). + __("Ordering Policy: ", lqinfo.getOrderingPolicyInfo()). + __("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : "enabled"). + __("Default Node Label Expression:", lqinfo.getDefaultNodeLabelExpression() == null ? NodeLabel.DEFAULT_NODE_LABEL_PARTITION : lqinfo.getDefaultNodeLabelExpression()). - _("Default Application Priority:", + __("Default Application Priority:", Integer.toString(lqinfo.getDefaultApplicationPriority())); } } @@ -208,14 +208,14 @@ class CapacitySchedulerPage extends RmView { protected void render(Block html) { TBODY<TABLE<Hamlet>> tbody = html.table("#userinfo").thead().$class("ui-widget-header").tr().th() - .$class("ui-state-default")._("User Name")._().th() - .$class("ui-state-default")._("Max Resource")._().th() - .$class("ui-state-default")._("Weight")._().th() - .$class("ui-state-default")._("Used Resource")._().th() - .$class("ui-state-default")._("Max AM Resource")._().th() - .$class("ui-state-default")._("Used AM Resource")._().th() - .$class("ui-state-default")._("Schedulable Apps")._().th() - .$class("ui-state-default")._("Non-Schedulable Apps")._()._()._() + .$class("ui-state-default").__("User Name").__().th() + .$class("ui-state-default").__("Max Resource").__().th() + .$class("ui-state-default").__("Weight").__().th() + .$class("ui-state-default").__("Used Resource").__().th() + .$class("ui-state-default").__("Max AM Resource").__().th() + .$class("ui-state-default").__("Used AM Resource").__().th() + .$class("ui-state-default").__("Schedulable Apps").__().th() + .$class("ui-state-default").__("Non-Schedulable Apps").__().__().__() .tbody(); ArrayList<UserInfo> users = lqinfo.getUsers().getUsersList(); @@ -240,11 +240,11 @@ class CapacitySchedulerPage extends RmView { .td(resourceUsages.getAMLimit().toString()) .td(amUsed.toString()) .td(Integer.toString(userInfo.getNumActiveApplications())) - .td(Integer.toString(userInfo.getNumPendingApplications()))._(); + .td(Integer.toString(userInfo.getNumPendingApplications())).__(); } - html.div().$class("usersinfo").h5("Active Users Info")._(); - tbody._()._(); + html.div().$class("usersinfo").h5("Active Users Info").__(); + tbody.__().__(); } } @@ -288,25 +288,25 @@ class CapacitySchedulerPage extends RmView { a(_Q).$style(width(absMaxCap * Q_MAX_WIDTH)). $title(join("Absolute Capacity:", percent(absCap))). span().$style(join(Q_GIVEN, ";font-size:1px;", width(absCap/absMaxCap))). - _('.')._(). + __('.').__(). span().$style(join(width(absUsedCap/absMaxCap), ";font-size:1px;left:0%;", absUsedCap > absCap ? Q_OVER : Q_UNDER)). - _('.')._(). - span(".q", "Queue: "+info.getQueuePath().substring(5))._(). + __('.').__(). + span(".q", "Queue: "+info.getQueuePath().substring(5)).__(). span().$class("qstats").$style(left(Q_STATS_POS)). - _(join(percent(used), " used"))._(); + __(join(percent(used), " used")).__(); csqinfo.qinfo = info; if (info.getQueues() == null) { - li.ul("#lq").li()._(LeafQueueInfoBlock.class)._()._(); - li.ul("#lq").li()._(QueueUsersInfoBlock.class)._()._(); + li.ul("#lq").li().__(LeafQueueInfoBlock.class).__().__(); + li.ul("#lq").li().__(QueueUsersInfoBlock.class).__().__(); } else { - li._(QueueBlock.class); + li.__(QueueBlock.class); } - li._(); + li.__(); } - ul._(); + ul.__(); } } @@ -327,7 +327,7 @@ class CapacitySchedulerPage extends RmView { @Override public void render(Block html) { - html._(MetricsOverviewTable.class); + html.__(MetricsOverviewTable.class); UserGroupInformation callerUGI = this.getCallerUGI(); boolean isAdmin = false; @@ -347,10 +347,10 @@ class CapacitySchedulerPage extends RmView { .$style( "border-style: solid; border-color: #000000; border-width: 1px;" + " cursor: hand; cursor: pointer; border-radius: 4px") - .$onclick("confirmAction()").b("Dump scheduler logs")._().select() - .$id("time").option().$value("60")._("1 min")._().option() - .$value("300")._("5 min")._().option().$value("600")._("10 min")._() - ._()._(); + .$onclick("confirmAction()").b("Dump scheduler logs").__().select() + .$id("time").option().$value("60").__("1 min").__().option() + .$value("300").__("5 min").__().option().$value("600").__("10 min").__() + .__().__(); StringBuilder script = new StringBuilder(); script @@ -377,36 +377,36 @@ class CapacitySchedulerPage extends RmView { .append(" console.log(data);").append(" });").append(" }") .append("}"); - html.script().$type("text/javascript")._(script.toString())._(); + html.script().$type("text/javascript").__(script.toString()).__(); } UL<DIV<DIV<Hamlet>>> ul = html. div("#cs-wrapper.ui-widget"). div(".ui-widget-header.ui-corner-top"). - _("Application Queues")._(). + __("Application Queues").__(). div("#cs.ui-widget-content.ui-corner-bottom"). ul(); if (cs == null) { ul. li(). a(_Q).$style(width(Q_MAX_WIDTH)). - span().$style(Q_END)._("100% ")._(). - span(".q", "default")._()._(); + span().$style(Q_END).__("100% ").__(). + span(".q", "default").__().__(); } else { ul. li().$style("margin-bottom: 1em"). - span().$style("font-weight: bold")._("Legend:")._(). + span().$style("font-weight: bold").__("Legend:").__(). span().$class("qlegend ui-corner-all").$style(Q_GIVEN). - _("Capacity")._(). + __("Capacity").__(). span().$class("qlegend ui-corner-all").$style(Q_UNDER). - _("Used")._(). + __("Used").__(). span().$class("qlegend ui-corner-all").$style(Q_OVER). - _("Used (over capacity)")._(). + __("Used (over capacity)").__(). span().$class("qlegend ui-corner-all ui-state-default"). - _("Max Capacity")._(). + __("Max Capacity").__(). span().$class("qlegend ui-corner-all").$style(ACTIVE_USER). - _("Users Requesting Resources")._(). - _(); + __("Users Requesting Resources").__(). + __(); float used = 0; @@ -433,11 +433,11 @@ class CapacitySchedulerPage extends RmView { ul.li(). a(_Q).$style(width(Q_MAX_WIDTH)). span().$style(join(width(used), ";left:0%;", - used > 1 ? Q_OVER : Q_UNDER))._(".")._(). - span(".q", "Queue: root")._(). + used > 1 ? Q_OVER : Q_UNDER)).__(".").__(). + span(".q", "Queue: root").__(). span().$class("qstats").$style(left(Q_STATS_POS)). - _(join(percent(used), " used"))._(). - _(QueueBlock.class)._(); + __(join(percent(used), " used")).__(). + __(QueueBlock.class).__(); } else { for (RMNodeLabel label : nodeLabelsInfo) { csqinfo.qinfo = null; @@ -453,29 +453,29 @@ class CapacitySchedulerPage extends RmView { ul.li(). a(_Q).$style(width(Q_MAX_WIDTH)). span().$style(join(width(used), ";left:0%;", - used > 1 ? Q_OVER : Q_UNDER))._(".")._(). - span(".q", partitionUiTag)._(). + used > 1 ? Q_OVER : Q_UNDER)).__(".").__(). + span(".q", partitionUiTag).__(). span().$class("qstats").$style(left(Q_STATS_POS)). - _(join(percent(used), " used"))._()._(); + __(join(percent(used), " used")).__().__(); //for the queue hierarchy under label UL<Hamlet> underLabel = html.ul("#pq"); underLabel.li(). a(_Q).$style(width(Q_MAX_WIDTH)). span().$style(join(width(used), ";left:0%;", - used > 1 ? Q_OVER : Q_UNDER))._(".")._(). - span(".q", "Queue: root")._(). + used > 1 ? Q_OVER : Q_UNDER)).__(".").__(). + span(".q", "Queue: root").__(). span().$class("qstats").$style(left(Q_STATS_POS)). - _(join(percent(used), " used"))._(). - _(QueueBlock.class)._()._(); + __(join(percent(used), " used")).__(). + __(QueueBlock.class).__().__(); } } } - ul._()._(). + ul.__().__(). script().$type("text/javascript"). - _("$('#cs').hide();")._()._(). - _(RMAppsBlock.class); - html._(HealthBlock.class); + __("$('#cs').hide();").__().__(). + __(RMAppsBlock.class); + html.__(HealthBlock.class); } } @@ -495,13 +495,13 @@ class CapacitySchedulerPage extends RmView { div.h4("Aggregate scheduler counts"); TBODY<TABLE<DIV<Hamlet>>> tbody = div.table("#lastrun").thead().$class("ui-widget-header").tr().th() - .$class("ui-state-default")._("Total Container Allocations(count)") - ._().th().$class("ui-state-default") - ._("Total Container Releases(count)")._().th() + .$class("ui-state-default").__("Total Container Allocations(count)") + .__().th().$class("ui-state-default") + .__("Total Container Releases(count)").__().th() .$class("ui-state-default") - ._("Total Fulfilled Reservations(count)")._().th() - .$class("ui-state-default")._("Total Container Preemptions(count)") - ._()._()._().tbody(); + .__("Total Fulfilled Reservations(count)").__().th() + .$class("ui-state-default").__("Total Container Preemptions(count)") + .__().__().__().tbody(); tbody .$class("ui-widget-content") .tr() @@ -512,15 +512,15 @@ class CapacitySchedulerPage extends RmView { String.valueOf(cs.getRootQueueMetrics() .getAggegatedReleasedContainers())) .td(healthInfo.getAggregateFulFilledReservationsCount().toString()) - .td(healthInfo.getAggregatePreemptionCount().toString())._()._()._(); + .td(healthInfo.getAggregatePreemptionCount().toString()).__().__().__(); div.h4("Last scheduler run"); tbody = div.table("#lastrun").thead().$class("ui-widget-header").tr().th() - .$class("ui-state-default")._("Time")._().th() - .$class("ui-state-default")._("Allocations(count - resources)")._() - .th().$class("ui-state-default")._("Reservations(count - resources)") - ._().th().$class("ui-state-default")._("Releases(count - resources)") - ._()._()._().tbody(); + .$class("ui-state-default").__("Time").__().th() + .$class("ui-state-default").__("Allocations(count - resources)").__() + .th().$class("ui-state-default").__("Reservations(count - resources)") + .__().th().$class("ui-state-default").__("Releases(count - resources)") + .__().__().__().tbody(); tbody .$class("ui-widget-content") .tr() @@ -533,7 +533,7 @@ class CapacitySchedulerPage extends RmView { + healthInfo.getResourcesReserved().toString()) .td( healthInfo.getReleaseCount().toString() + " - " - + healthInfo.getResourcesReleased().toString())._()._()._(); + + healthInfo.getResourcesReleased().toString()).__().__().__(); Map<String, SchedulerHealth.DetailedInformation> info = new HashMap<>(); info.put("Allocation", healthInfo.getLastAllocationDetails()); info.put("Reservation", healthInfo.getLastReservationDetails()); @@ -549,10 +549,10 @@ class CapacitySchedulerPage extends RmView { div.h4("Last " + entry.getKey()); tbody = div.table(table).thead().$class("ui-widget-header").tr().th() - .$class("ui-state-default")._("Time")._().th() - .$class("ui-state-default")._("Container Id")._().th() - .$class("ui-state-default")._("Node Id")._().th() - .$class("ui-state-default")._("Queue")._()._()._().tbody(); + .$class("ui-state-default").__("Time").__().th() + .$class("ui-state-default").__("Container Id").__().th() + .$class("ui-state-default").__("Node Id").__().th() + .$class("ui-state-default").__("Queue").__().__().__().tbody(); SchedulerHealth.DetailedInformation di = entry.getValue(); if (di.getTimestamp() != 0) { containerId = di.getContainerId().toString(); @@ -561,26 +561,26 @@ class CapacitySchedulerPage extends RmView { } tbody.$class("ui-widget-content").tr() .td(Times.format(di.getTimestamp())).td(containerId).td(nodeId) - .td(queue)._()._()._(); + .td(queue).__().__().__(); } - div._(); + div.__(); } } - @Override protected void postHead(Page.HTML<_> html) { + @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 { 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 }", ".qstats { font-weight: normal; font-size: 80%; position: absolute }", ".qlegend { font-weight: normal; padding: 0 1em; margin: 1em }", - "table.info tr th {width: 50%}")._(). // to center info table + "table.info tr th {width: 50%}").__(). // to center info table script("/static/jt/jquery.jstree.js"). script().$type("text/javascript"). - _("$(function() {", + __("$(function() {", " $('#cs a span').addClass('ui-corner-all').css('position', 'absolute');", " $('#cs').bind('loaded.jstree', function (e, data) {", " var callback = { call:reopenQueryNodes }", @@ -603,8 +603,8 @@ class CapacitySchedulerPage extends RmView { " $('#apps').dataTable().fnFilter(q, 4, true);", " });", " $('#cs').show();", - "});")._(). - _(SchedulerPageUtil.QueueBlockUtil.class); + "});").__(). + __(SchedulerPageUtil.QueueBlockUtil.class); } @Override protected Class<? extends SubView> content() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ContainerPage.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/ContainerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ContainerPage.java index b8cd1ad..2cd209b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ContainerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ContainerPage.java @@ -28,7 +28,7 @@ import org.apache.hadoop.yarn.webapp.YarnWebParams; public class ContainerPage extends RmView { @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String containerId = $(YarnWebParams.CONTAINER_ID); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.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/DefaultSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java index d442064..0b0884b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/DefaultSchedulerPage.java @@ -26,9 +26,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoSchedule import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FifoSchedulerInfo; import org.apache.hadoop.yarn.server.webapp.AppsBlock; 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.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.UL; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -53,16 +53,16 @@ class DefaultSchedulerPage extends RmView { @Override public void render(Block html) { info("\'" + sinfo.getQueueName() + "\' Queue Status"). - _("Queue State:" , sinfo.getState()). - _("Minimum Queue Memory Capacity:" , Long.toString(sinfo.getMinQueueMemoryCapacity())). - _("Maximum Queue Memory Capacity:" , Long.toString(sinfo.getMaxQueueMemoryCapacity())). - _("Number of Nodes:" , Integer.toString(sinfo.getNumNodes())). - _("Used Node Capacity:" , Integer.toString(sinfo.getUsedNodeCapacity())). - _("Available Node Capacity:" , Integer.toString(sinfo.getAvailNodeCapacity())). - _("Total Node Capacity:" , Integer.toString(sinfo.getTotalNodeCapacity())). - _("Number of Node Containers:" , Integer.toString(sinfo.getNumContainers())); - - html._(InfoBlock.class); + __("Queue State:" , sinfo.getState()). + __("Minimum Queue Memory Capacity:" , Long.toString(sinfo.getMinQueueMemoryCapacity())). + __("Maximum Queue Memory Capacity:" , Long.toString(sinfo.getMaxQueueMemoryCapacity())). + __("Number of Nodes:" , Integer.toString(sinfo.getNumNodes())). + __("Used Node Capacity:" , Integer.toString(sinfo.getUsedNodeCapacity())). + __("Available Node Capacity:" , Integer.toString(sinfo.getAvailNodeCapacity())). + __("Total Node Capacity:" , Integer.toString(sinfo.getTotalNodeCapacity())). + __("Number of Node Containers:" , Integer.toString(sinfo.getNumContainers())); + + html.__(InfoBlock.class); } } @@ -77,11 +77,11 @@ class DefaultSchedulerPage extends RmView { @Override public void render(Block html) { - html._(MetricsOverviewTable.class); + html.__(MetricsOverviewTable.class); UL<DIV<DIV<Hamlet>>> ul = html. div("#cs-wrapper.ui-widget"). div(".ui-widget-header.ui-corner-top"). - _("FifoScheduler Queue")._(). + __("FifoScheduler Queue").__(). div("#cs.ui-widget-content.ui-corner-bottom"). ul(); @@ -89,8 +89,8 @@ class DefaultSchedulerPage extends RmView { ul. li(). a(_Q).$style(width(WIDTH_F)). - span().$style(Q_END)._("100% ")._(). - span(".q", "default")._()._(); + span().$style(Q_END).__("100% ").__(). + span(".q", "default").__().__(); } else { float used = sinfo.getUsedCapacity(); float set = sinfo.getCapacity(); @@ -99,33 +99,33 @@ class DefaultSchedulerPage extends RmView { li(). a(_Q).$style(width(WIDTH_F)). $title(join("used:", percent(used))). - span().$style(Q_END)._("100%")._(). + span().$style(Q_END).__("100%").__(). span().$style(join(width(delta), ';', used > set ? OVER : UNDER, - ';', used > set ? left(set) : left(used)))._(".")._(). - span(".q", sinfo.getQueueName())._(). - _(QueueInfoBlock.class)._(); + ';', used > set ? left(set) : left(used))).__(".").__(). + span(".q", sinfo.getQueueName()).__(). + __(QueueInfoBlock.class).__(); } - ul._()._(). + ul.__().__(). script().$type("text/javascript"). - _("$('#cs').hide();")._()._(). - _(AppsBlock.class); + __("$('#cs').hide();").__().__(). + __(AppsBlock.class); } } - @Override protected void postHead(Page.HTML<_> html) { + @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 { 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 + "table.info tr th {width: 50%}").__(). // to center info table script("/static/jt/jquery.jstree.js"). script().$type("text/javascript"). - _("$(function() {", + __("$(function() {", " $('#cs a span').addClass('ui-corner-all').css('position', 'absolute');", " $('#cs').bind('loaded.jstree', function (e, data) {", " data.inst.open_all(); }).", @@ -142,7 +142,7 @@ class DefaultSchedulerPage extends RmView { " $('#apps').dataTable().fnFilter(q, 4);", " });", " $('#cs').show();", - "});")._(); + "});").__(); } @Override protected Class<? extends SubView> content() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ErrorBlock.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/ErrorBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ErrorBlock.java index 963e53f..6fe5c3a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ErrorBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/ErrorBlock.java @@ -34,6 +34,6 @@ public class ErrorBlock extends HtmlBlock { @Override protected void render(Block html) { - html.p()._($(ERROR_MESSAGE))._(); + html.p().__($(ERROR_MESSAGE)).__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.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/FairSchedulerAppsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java index b7a7a93..ac88f86 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java @@ -41,9 +41,9 @@ 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.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.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; @@ -98,7 +98,7 @@ public class FairSchedulerAppsBlock extends HtmlBlock { th(".reservedCpu", "Reserved CPU VCores"). th(".reservedMemory", "Reserved Memory MB"). th(".progress", "Progress"). - th(".ui", "Tracking UI")._()._(). + th(".ui", "Tracking UI").__().__(). tbody(); Collection<YarnApplicationState> reqAppStates = null; String reqStateString = $(APP_STATE); @@ -168,8 +168,8 @@ public class FairSchedulerAppsBlock extends HtmlBlock { } appsTableData.append("]"); html.script().$type("text/javascript"). - _("var appsTableData=" + appsTableData)._(); + __("var appsTableData=" + appsTableData).__(); - tbody._()._(); + tbody.__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.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/FairSchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index 5f46841..ffa4594 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -31,10 +31,10 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerQue import org.apache.hadoop.yarn.server.webapp.WebPageUtils; 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.LI; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.UL; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.LI; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.UL; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.InfoBlock; @@ -70,21 +70,21 @@ public class FairSchedulerPage extends RmView { @Override protected void render(Block html) { ResponseInfo ri = info("\'" + qinfo.getQueueName() + "\' Queue Status"). - _("Used Resources:", qinfo.getUsedResources().toString()). - _("Demand Resources:", qinfo.getDemandResources().toString()). - _("Num Active Applications:", qinfo.getNumActiveApplications()). - _("Num Pending Applications:", qinfo.getNumPendingApplications()). - _("Min Resources:", qinfo.getMinResources().toString()). - _("Max Resources:", qinfo.getMaxResources().toString()). - _("Reserved Resources:", qinfo.getReservedResources().toString()); + __("Used Resources:", qinfo.getUsedResources().toString()). + __("Demand Resources:", qinfo.getDemandResources().toString()). + __("Num Active Applications:", qinfo.getNumActiveApplications()). + __("Num Pending Applications:", qinfo.getNumPendingApplications()). + __("Min Resources:", qinfo.getMinResources().toString()). + __("Max Resources:", qinfo.getMaxResources().toString()). + __("Reserved Resources:", qinfo.getReservedResources().toString()); int maxApps = qinfo.getMaxApplications(); if (maxApps < Integer.MAX_VALUE) { - ri._("Max Running Applications:", qinfo.getMaxApplications()); + ri.__("Max Running Applications:", qinfo.getMaxApplications()); } - ri._(STEADY_FAIR_SHARE + ":", qinfo.getSteadyFairShare().toString()); - ri._(INSTANTANEOUS_FAIR_SHARE + ":", qinfo.getFairShare().toString()); - ri._("Preemptable:", qinfo.isPreemptable()); - html._(InfoBlock.class); + ri.__(STEADY_FAIR_SHARE + ":", qinfo.getSteadyFairShare().toString()); + ri.__(INSTANTANEOUS_FAIR_SHARE + ":", qinfo.getFairShare().toString()); + ri.__("Preemptable:", qinfo.isPreemptable()); + html.__(InfoBlock.class); // clear the info contents so this queue's info doesn't accumulate into another queue's info ri.clear(); @@ -102,17 +102,17 @@ public class FairSchedulerPage extends RmView { @Override protected void render(Block html) { ResponseInfo ri = info("\'" + qinfo.getQueueName() + "\' Queue Status"). - _("Used Resources:", qinfo.getUsedResources().toString()). - _("Min Resources:", qinfo.getMinResources().toString()). - _("Max Resources:", qinfo.getMaxResources().toString()). - _("Reserved Resources:", qinfo.getReservedResources().toString()); + __("Used Resources:", qinfo.getUsedResources().toString()). + __("Min Resources:", qinfo.getMinResources().toString()). + __("Max Resources:", qinfo.getMaxResources().toString()). + __("Reserved Resources:", qinfo.getReservedResources().toString()); int maxApps = qinfo.getMaxApplications(); if (maxApps < Integer.MAX_VALUE) { - ri._("Max Running Applications:", qinfo.getMaxApplications()); + ri.__("Max Running Applications:", qinfo.getMaxApplications()); } - ri._(STEADY_FAIR_SHARE + ":", qinfo.getSteadyFairShare().toString()); - ri._(INSTANTANEOUS_FAIR_SHARE + ":", qinfo.getFairShare().toString()); - html._(InfoBlock.class); + ri.__(STEADY_FAIR_SHARE + ":", qinfo.getSteadyFairShare().toString()); + ri.__(INSTANTANEOUS_FAIR_SHARE + ":", qinfo.getFairShare().toString()); + html.__(InfoBlock.class); // clear the info contents so this queue's info doesn't accumulate into another queue's info ri.clear(); @@ -141,28 +141,28 @@ public class FairSchedulerPage extends RmView { $title(join(join(STEADY_FAIR_SHARE + ":", percent(steadyFairShare)), join(" " + INSTANTANEOUS_FAIR_SHARE + ":", percent(instantaneousFairShare)))). span().$style(join(Q_GIVEN, ";font-size:1px;", width(steadyFairShare / capacity))). - _('.')._(). + __('.').__(). span().$style(join(Q_INSTANTANEOUS_FS, ";font-size:1px;", width(instantaneousFairShare/capacity))). - _('.')._(). + __('.').__(). span().$style(join(width(used/capacity), ";font-size:1px;left:0%;", used > instantaneousFairShare ? Q_OVER : Q_UNDER)). - _('.')._(). - span(".q", info.getQueueName())._(). + __('.').__(). + span(".q", info.getQueueName()).__(). span().$class("qstats").$style(left(Q_STATS_POS)). - _(join(percent(used), " used"))._(); + __(join(percent(used), " used")).__(); fsqinfo.qinfo = info; if (info instanceof FairSchedulerLeafQueueInfo) { - li.ul("#lq").li()._(LeafQueueBlock.class)._()._(); + li.ul("#lq").li().__(LeafQueueBlock.class).__().__(); } else { - li.ul("#lq").li()._(ParentQueueBlock.class)._()._(); - li._(QueueBlock.class); + li.ul("#lq").li().__(ParentQueueBlock.class).__().__(); + li.__(QueueBlock.class); } - li._(); + li.__(); } - ul._(); + ul.__(); } } @@ -177,19 +177,19 @@ public class FairSchedulerPage extends RmView { @Override public void render(Block html) { - html._(MetricsOverviewTable.class); + html.__(MetricsOverviewTable.class); UL<DIV<DIV<Hamlet>>> ul = html. div("#cs-wrapper.ui-widget"). div(".ui-widget-header.ui-corner-top"). - _("Application Queues")._(). + __("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")._()._(); + span().$style(Q_END).__("100% ").__(). + span(".q", "default").__().__(); } else { FairSchedulerInfo sinfo = new FairSchedulerInfo(fs); fsqinfo.qinfo = sinfo.getRootQueueInfo(); @@ -197,52 +197,52 @@ public class FairSchedulerPage extends RmView { ul. li().$style("margin-bottom: 1em"). - span().$style("font-weight: bold")._("Legend:")._(). + span().$style("font-weight: bold").__("Legend:").__(). span().$class("qlegend ui-corner-all").$style(Q_GIVEN). $title("The steady fair shares consider all queues, " + "both active (with running applications) and inactive."). - _(STEADY_FAIR_SHARE)._(). + __(STEADY_FAIR_SHARE).__(). span().$class("qlegend ui-corner-all").$style(Q_INSTANTANEOUS_FS). $title("The instantaneous fair shares consider only active " + "queues (with running applications)."). - _(INSTANTANEOUS_FAIR_SHARE)._(). + __(INSTANTANEOUS_FAIR_SHARE).__(). span().$class("qlegend ui-corner-all").$style(Q_UNDER). - _("Used")._(). + __("Used").__(). span().$class("qlegend ui-corner-all").$style(Q_OVER). - _("Used (over fair share)")._(). + __("Used (over fair share)").__(). span().$class("qlegend ui-corner-all ui-state-default"). - _("Max Capacity")._(). - _(). + __("Max Capacity").__(). + __(). li(). a(_Q).$style(width(Q_MAX_WIDTH)). span().$style(join(width(used), ";left:0%;", - used > 1 ? Q_OVER : Q_UNDER))._(".")._(). - span(".q", "root")._(). + used > 1 ? Q_OVER : Q_UNDER)).__(".").__(). + span(".q", "root").__(). span().$class("qstats").$style(left(Q_STATS_POS)). - _(join(percent(used), " used"))._(). - _(QueueBlock.class)._(); + __(join(percent(used), " used")).__(). + __(QueueBlock.class).__(); } - ul._()._(). + ul.__().__(). script().$type("text/javascript"). - _("$('#cs').hide();")._()._(). - _(FairSchedulerAppsBlock.class); + __("$('#cs').hide();").__().__(). + __(FairSchedulerAppsBlock.class); } } - @Override protected void postHead(Page.HTML<_> html) { + @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 { 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 }", ".qstats { font-weight: normal; font-size: 80%; position: absolute }", ".qlegend { font-weight: normal; padding: 0 1em; margin: 1em }", - "table.info tr th {width: 50%}")._(). // to center info table + "table.info tr th {width: 50%}").__(). // to center info table script("/static/jt/jquery.jstree.js"). script().$type("text/javascript"). - _("$(function() {", + __("$(function() {", " $('#cs a span').addClass('ui-corner-all').css('position', 'absolute');", " $('#cs').bind('loaded.jstree', function (e, data) {", " var callback = { call:reopenQueryNodes }", @@ -262,8 +262,8 @@ public class FairSchedulerPage extends RmView { " $('#apps').dataTable().fnFilter(q, 4, true);", " });", " $('#cs').show();", - "});")._(). - _(SchedulerPageUtil.QueueBlockUtil.class); + "});").__(). + __(SchedulerPageUtil.QueueBlockUtil.class); } @Override protected Class<? extends SubView> content() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.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/MetricsOverviewTable.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.java index fe7b247..f6b1a94 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.java @@ -24,8 +24,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsIn import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.UserMetricsInfo; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; @@ -61,19 +61,19 @@ public class MetricsOverviewTable extends HtmlBlock { table("#metricsoverview"). thead().$class("ui-widget-header"). tr(). - th().$class("ui-state-default")._("Apps Submitted")._(). - th().$class("ui-state-default")._("Apps Pending")._(). - th().$class("ui-state-default")._("Apps Running")._(). - th().$class("ui-state-default")._("Apps Completed")._(). - th().$class("ui-state-default")._("Containers Running")._(). - th().$class("ui-state-default")._("Memory Used")._(). - th().$class("ui-state-default")._("Memory Total")._(). - th().$class("ui-state-default")._("Memory Reserved")._(). - th().$class("ui-state-default")._("VCores Used")._(). - th().$class("ui-state-default")._("VCores Total")._(). - th().$class("ui-state-default")._("VCores Reserved")._(). - _(). - _(). + th().$class("ui-state-default").__("Apps Submitted").__(). + th().$class("ui-state-default").__("Apps Pending").__(). + th().$class("ui-state-default").__("Apps Running").__(). + th().$class("ui-state-default").__("Apps Completed").__(). + th().$class("ui-state-default").__("Containers Running").__(). + th().$class("ui-state-default").__("Memory Used").__(). + th().$class("ui-state-default").__("Memory Total").__(). + th().$class("ui-state-default").__("Memory Reserved").__(). + th().$class("ui-state-default").__("VCores Used").__(). + th().$class("ui-state-default").__("VCores Total").__(). + th().$class("ui-state-default").__("VCores Reserved").__(). + __(). + __(). tbody().$class("ui-widget-content"). tr(). td(String.valueOf(clusterMetrics.getAppsSubmitted())). @@ -92,33 +92,33 @@ public class MetricsOverviewTable extends HtmlBlock { td(String.valueOf(clusterMetrics.getAllocatedVirtualCores())). td(String.valueOf(clusterMetrics.getTotalVirtualCores())). td(String.valueOf(clusterMetrics.getReservedVirtualCores())). - _(). - _()._(); + __(). + __().__(); div.h3("Cluster Nodes Metrics"). table("#nodemetricsoverview"). thead().$class("ui-widget-header"). tr(). - th().$class("ui-state-default")._("Active Nodes")._(). - th().$class("ui-state-default")._("Decommissioning Nodes")._(). - th().$class("ui-state-default")._("Decommissioned Nodes")._(). - th().$class("ui-state-default")._("Lost Nodes")._(). - th().$class("ui-state-default")._("Unhealthy Nodes")._(). - th().$class("ui-state-default")._("Rebooted Nodes")._(). - th().$class("ui-state-default")._("Shutdown Nodes")._(). - _(). - _(). + th().$class("ui-state-default").__("Active Nodes").__(). + th().$class("ui-state-default").__("Decommissioning Nodes").__(). + th().$class("ui-state-default").__("Decommissioned Nodes").__(). + th().$class("ui-state-default").__("Lost Nodes").__(). + th().$class("ui-state-default").__("Unhealthy Nodes").__(). + th().$class("ui-state-default").__("Rebooted Nodes").__(). + th().$class("ui-state-default").__("Shutdown Nodes").__(). + __(). + __(). tbody().$class("ui-widget-content"). tr(). - td().a(url("nodes"),String.valueOf(clusterMetrics.getActiveNodes()))._(). - td().a(url("nodes/decommissioning"), String.valueOf(clusterMetrics.getDecommissioningNodes()))._(). - td().a(url("nodes/decommissioned"),String.valueOf(clusterMetrics.getDecommissionedNodes()))._(). - td().a(url("nodes/lost"),String.valueOf(clusterMetrics.getLostNodes()))._(). - td().a(url("nodes/unhealthy"),String.valueOf(clusterMetrics.getUnhealthyNodes()))._(). - td().a(url("nodes/rebooted"),String.valueOf(clusterMetrics.getRebootedNodes()))._(). - td().a(url("nodes/shutdown"),String.valueOf(clusterMetrics.getShutdownNodes()))._(). - _(). - _()._(); + td().a(url("nodes"), String.valueOf(clusterMetrics.getActiveNodes())).__(). + td().a(url("nodes/decommissioning"), String.valueOf(clusterMetrics.getDecommissioningNodes())).__(). + td().a(url("nodes/decommissioned"), String.valueOf(clusterMetrics.getDecommissionedNodes())).__(). + td().a(url("nodes/lost"), String.valueOf(clusterMetrics.getLostNodes())).__(). + td().a(url("nodes/unhealthy"), String.valueOf(clusterMetrics.getUnhealthyNodes())).__(). + td().a(url("nodes/rebooted"), String.valueOf(clusterMetrics.getRebootedNodes())).__(). + td().a(url("nodes/shutdown"), String.valueOf(clusterMetrics.getShutdownNodes())).__(). + __(). + __().__(); String user = request().getRemoteUser(); if (user != null) { @@ -128,21 +128,21 @@ public class MetricsOverviewTable extends HtmlBlock { table("#usermetricsoverview"). thead().$class("ui-widget-header"). tr(). - th().$class("ui-state-default")._("Apps Submitted")._(). - th().$class("ui-state-default")._("Apps Pending")._(). - th().$class("ui-state-default")._("Apps Running")._(). - th().$class("ui-state-default")._("Apps Completed")._(). - th().$class("ui-state-default")._("Containers Running")._(). - th().$class("ui-state-default")._("Containers Pending")._(). - th().$class("ui-state-default")._("Containers Reserved")._(). - th().$class("ui-state-default")._("Memory Used")._(). - th().$class("ui-state-default")._("Memory Pending")._(). - th().$class("ui-state-default")._("Memory Reserved")._(). - th().$class("ui-state-default")._("VCores Used")._(). - th().$class("ui-state-default")._("VCores Pending")._(). - th().$class("ui-state-default")._("VCores Reserved")._(). - _(). - _(). + th().$class("ui-state-default").__("Apps Submitted").__(). + th().$class("ui-state-default").__("Apps Pending").__(). + th().$class("ui-state-default").__("Apps Running").__(). + th().$class("ui-state-default").__("Apps Completed").__(). + th().$class("ui-state-default").__("Containers Running").__(). + th().$class("ui-state-default").__("Containers Pending").__(). + th().$class("ui-state-default").__("Containers Reserved").__(). + th().$class("ui-state-default").__("Memory Used").__(). + th().$class("ui-state-default").__("Memory Pending").__(). + th().$class("ui-state-default").__("Memory Reserved").__(). + th().$class("ui-state-default").__("VCores Used").__(). + th().$class("ui-state-default").__("VCores Pending").__(). + th().$class("ui-state-default").__("VCores Reserved").__(). + __(). + __(). tbody().$class("ui-widget-content"). tr(). td(String.valueOf(userMetrics.getAppsSubmitted())). @@ -163,8 +163,8 @@ public class MetricsOverviewTable extends HtmlBlock { td(String.valueOf(userMetrics.getAllocatedVirtualCores())). td(String.valueOf(userMetrics.getPendingVirtualCores())). td(String.valueOf(userMetrics.getReservedVirtualCores())). - _(). - _()._(); + __(). + __().__(); } } @@ -175,14 +175,14 @@ public class MetricsOverviewTable extends HtmlBlock { table("#schedulermetricsoverview"). thead().$class("ui-widget-header"). tr(). - th().$class("ui-state-default")._("Scheduler Type")._(). - th().$class("ui-state-default")._("Scheduling Resource Type")._(). - th().$class("ui-state-default")._("Minimum Allocation")._(). - th().$class("ui-state-default")._("Maximum Allocation")._(). + th().$class("ui-state-default").__("Scheduler Type").__(). + th().$class("ui-state-default").__("Scheduling Resource Type").__(). + th().$class("ui-state-default").__("Minimum Allocation").__(). + th().$class("ui-state-default").__("Maximum Allocation").__(). th().$class("ui-state-default") - ._("Maximum Cluster Application Priority")._(). - _(). - _(). + .__("Maximum Cluster Application Priority").__(). + __(). + __(). tbody().$class("ui-widget-content"). tr(). td(String.valueOf(schedulerInfo.getSchedulerType())). @@ -190,9 +190,9 @@ public class MetricsOverviewTable extends HtmlBlock { td(schedulerInfo.getMinAllocation().toString()). td(schedulerInfo.getMaxAllocation().toString()). td(String.valueOf(schedulerInfo.getMaxClusterLevelAppPriority())). - _(). - _()._(); + __(). + __().__(); - div._(); + div.__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.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/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java index ca55175..1993f6c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NavBlock.java @@ -23,10 +23,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.util.Log4jWarningErrorMetricsAppender; -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.LI; -import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.UL; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.DIV; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.LI; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.UL; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; public class NavBlock extends HtmlBlock { @@ -45,29 +45,29 @@ public class NavBlock extends HtmlBlock { div("#nav"). h3("Cluster"). ul(). - li().a(url("cluster"), "About")._(). - li().a(url("nodes"), "Nodes")._(). - li().a(url("nodelabels"), "Node Labels")._(); + li().a(url("cluster"), "About").__(). + li().a(url("nodes"), "Nodes").__(). + li().a(url("nodelabels"), "Node Labels").__(); UL<LI<UL<DIV<Hamlet>>>> subAppsList = mainList. li().a(url("apps"), "Applications"). ul(); - subAppsList.li()._(); + subAppsList.li().__(); for (YarnApplicationState state : YarnApplicationState.values()) { subAppsList. - li().a(url("apps", state.toString()), state.toString())._(); + li().a(url("apps", state.toString()), state.toString()).__(); } - subAppsList._()._(); + subAppsList.__().__(); UL<DIV<Hamlet>> tools = mainList. - li().a(url("scheduler"), "Scheduler")._()._(). + li().a(url("scheduler"), "Scheduler").__().__(). h3("Tools").ul(); - tools.li().a("/conf", "Configuration")._(). - li().a("/logs", "Local logs")._(). - li().a("/stacks", "Server stacks")._(). - li().a("/jmx?qry=Hadoop:*", "Server metrics")._(); + tools.li().a("/conf", "Configuration").__(). + li().a("/logs", "Local logs").__(). + li().a("/stacks", "Server stacks").__(). + li().a("/jmx?qry=Hadoop:*", "Server metrics").__(); if (addErrorsAndWarningsLink) { - tools.li().a(url("errors-and-warnings"), "Errors/Warnings")._(); + tools.li().a(url("errors-and-warnings"), "Errors/Warnings").__(); } - tools._()._(); + tools.__().__(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.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/NodeLabelsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.java index ea85d13..6ff7628 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodeLabelsPage.java @@ -26,10 +26,10 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.webapp.SubView; 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.hamlet.Hamlet.TR; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TR; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import com.google.inject.Inject; @@ -53,7 +53,7 @@ public class NodeLabelsPage extends RmView { th(".type", "Label Type"). th(".numOfActiveNMs", "Num Of Active NMs"). th(".totalResource", "Total Resource"). - _()._(). + __().__(). tbody(); RMNodeLabelsManager nlm = rm.getRMContext().getNodeLabelManager(); @@ -71,17 +71,17 @@ public class NodeLabelsPage extends RmView { .a(url("nodes", "?" + YarnWebParams.NODE_LABEL + "=" + info.getLabelName()), String.valueOf(nActiveNMs)) - ._(); + .__(); } else { row = row.td(String.valueOf(nActiveNMs)); } - row.td(info.getResource().toString())._(); + row.td(info.getResource().toString()).__(); } - tbody._()._(); + tbody.__().__(); } } - @Override protected void preHead(Page.HTML<_> html) { + @Override protected void preHead(Page.HTML<__> html) { commonPreHead(html); String title = "Node labels of the cluster"; setTitle(title); http://git-wip-us.apache.org/repos/asf/hadoop/blob/38c6fa5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.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/NodesPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java index c03df63..d0e384d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java @@ -30,9 +30,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo; import org.apache.hadoop.yarn.util.Times; import org.apache.hadoop.yarn.webapp.SubView; -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.hamlet2.Hamlet; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE; +import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY; import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import java.util.Collection; @@ -63,7 +63,7 @@ class NodesPage extends RmView { @Override protected void render(Block html) { - html._(MetricsOverviewTable.class); + html.__(MetricsOverviewTable.class); ResourceScheduler sched = rm.getResourceScheduler(); @@ -98,7 +98,7 @@ class NodesPage extends RmView { } TBODY<TABLE<Hamlet>> tbody = - trbody.th(".nodeManagerVersion", "Version")._()._().tbody(); + trbody.th(".nodeManagerVersion", "Version").__().__().tbody(); NodeState stateFilter = null; if (type != null && !type.isEmpty()) { @@ -201,13 +201,13 @@ class NodesPage extends RmView { } nodeTableData.append("]"); html.script().$type("text/javascript") - ._("var nodeTableData=" + nodeTableData)._(); - tbody._()._(); + .__("var nodeTableData=" + nodeTableData).__(); + tbody.__().__(); } } @Override - protected void preHead(Page.HTML<_> html) { + protected void preHead(Page.HTML<__> html) { commonPreHead(html); String type = $(NODE_STATE); String title = "Nodes of the cluster"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
