diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js index 84ff59e..1ea655b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js @@ -258,7 +258,6 @@ export default BaseChartComponent.extend({ }, didInsertElement: function () { - var parentId = this.get("parentId"); var self = this; var optionsData = [this.memoryLabel, this.cpuLabel, this.containersLabel]; d3.select("#heatmap-select") diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js index 6788582..4a0e6aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js @@ -153,7 +153,7 @@ export default Ember.Component.extend({ .attr("r", 1e-6) .style("fill", function(d) { var maxCap = d.queueData.get(this.max); - maxCap = maxCap == undefined ? 100 : maxCap; + maxCap = maxCap === undefined ? 100 : maxCap; var usedCap = d.queueData.get(this.used) / maxCap * 100.0; if (usedCap <= 60.0) { return "LimeGreen"; @@ -172,7 +172,7 @@ export default Ember.Component.extend({ .attr("text-anchor", function() { return "middle"; }) .text(function(d) { var maxCap = d.queueData.get(this.max); - maxCap = maxCap == undefined ? 100 : maxCap; + maxCap = maxCap === undefined ? 100 : maxCap; var usedCap = d.queueData.get(this.used) / maxCap * 100.0; if (usedCap >= 100.0) { return usedCap.toFixed(0) + "%"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js index 08ca5a6..986b1fd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js @@ -50,6 +50,13 @@ export default Ember.Controller.extend({ html = html + '>Nodes' + '(current)'; return Ember.String.htmlSafe(html); + }.property('currentPath'), + + isQueuesTabActive: function() { + var path = this.get('currentPath'); + if (path === 'yarn-queues') { + return true; + } + return false; }.property('currentPath') }); - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js index 1cb07bb..b84a473 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js @@ -17,6 +17,7 @@ */ import DS from 'ember-data'; +import Converter from 'yarn-ui/utils/converter'; export default DS.Model.extend({ name: DS.attr('string'), @@ -46,18 +47,19 @@ export default DS.Model.extend({ }.property("children"), capacitiesBarChartData: function() { + var floatToFixed = Converter.floatToFixed; return [ { label: "Absolute Capacity", - value: this.get("name") === "root" ? 100 : this.get("absCapacity") + value: this.get("name") === "root" ? 100 : floatToFixed(this.get("absCapacity")) }, { label: "Absolute Used", - value: this.get("name") === "root" ? this.get("usedCapacity") : this.get("absUsedCapacity") + value: this.get("name") === "root" ? floatToFixed(this.get("usedCapacity")) : floatToFixed(this.get("absUsedCapacity")) }, { label: "Absolute Max Capacity", - value: this.get("name") === "root" ? 100 : this.get("absMaxCapacity") + value: this.get("name") === "root" ? 100 : floatToFixed(this.get("absMaxCapacity")) } ]; }.property("absCapacity", "usedCapacity", "absMaxCapacity"), diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js index be71362..3f358cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js @@ -17,6 +17,7 @@ */ import DS from 'ember-data'; +import Converter from 'yarn-ui/utils/converter'; export default DS.Model.extend({ name: DS.attr('string'), @@ -48,18 +49,19 @@ export default DS.Model.extend({ }.property("children"), capacitiesBarChartData: function() { + var floatToFixed = Converter.floatToFixed; return [ { label: "Steady Fair Memory", - value: this.get("steadyFairResources.memory") + value: floatToFixed(this.get("steadyFairResources.memory")) }, { label: "Used Memory", - value: this.get("usedResources.memory") + value: floatToFixed(this.get("usedResources.memory")) }, { label: "Maximum Memory", - value: this.get("maxResources.memory") + value: floatToFixed(this.get("maxResources.memory")) } ]; }.property("maxResources.memory", "usedResources.memory", "maxResources.memory"), diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js index 2386dc4..40a8e6c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js @@ -17,6 +17,7 @@ */ import DS from 'ember-data'; +import Converter from 'yarn-ui/utils/converter'; export default DS.Model.extend({ name: DS.attr('string'), @@ -33,18 +34,19 @@ export default DS.Model.extend({ type: DS.attr('string'), capacitiesBarChartData: function() { + var floatToFixed = Converter.floatToFixed; return [ { label: "Available Capacity", - value: this.get("availNodeCapacity") + value: floatToFixed(this.get("availNodeCapacity")) }, { label: "Used Capacity", - value: this.get("usedNodeCapacity") + value: floatToFixed(this.get("usedNodeCapacity")) }, { label: "Total Capacity", - value: this.get("totalNodeCapacity") + value: floatToFixed(this.get("totalNodeCapacity")) } ]; }.property("availNodeCapacity", "usedNodeCapacity", "totalNodeCapacity") diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js index 2215d2d..c730e44 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js @@ -59,8 +59,9 @@ export default DS.JSONAPISerializer.extend({ handleQueue(store, primaryModelClass, payload, id, requestType) { var data = []; - var includedData = []; - if(!payload) return data; + if (!payload) { + return data; + } var result = this.normalizeSingleResponse(store, primaryModelClass, payload, id, requestType); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs index e988e0c..1ac53bf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs @@ -41,7 +41,7 @@ (current) {{/link-to}} {{/link-to}} - {{#link-to 'yarn-queues' 'root' tagName="li"}} + {{#link-to 'yarn-queues' 'root' tagName="li" classNameBindings="isQueuesTabActive:active"}} {{#link-to 'yarn-queues' 'root' class="navigation-link"}}Queues (current) {{/link-to}} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs index 3f6017f..a04a26d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs @@ -20,7 +20,7 @@ Configurations - Value + Value @@ -32,10 +32,12 @@ Configured Max Capacity {{queue.maxCapacity}} + {{#if queue.state}} State {{queue.state}} + {{/if}} {{#if queue.isLeafQueue}} User Limit Percent diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs index 00fabcc..b2448cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs @@ -20,7 +20,7 @@ Configurations - Value + Value diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs index 0341108..6d0e994 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs @@ -39,7 +39,7 @@ {{bar-chart data=model.selectedQueue.capacitiesBarChartData title="" parentId="capacity-bar-chart" - textWidth=150 + textWidth=175 ratio=0.55 maxHeight=350}} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs index 4ced3e7..f6f467f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs @@ -20,7 +20,7 @@ Configurations - Value + Value @@ -32,10 +32,12 @@ Used Capacity {{queue.usedCapacity}} + {{#if queue.state}} State {{queue.state}} + {{/if}} Minimum Queue Memory Capacity {{queue.minQueueMemoryCapacity}} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs index 46d79f0..90cbd27 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs @@ -39,7 +39,7 @@ {{bar-chart data=model.selectedQueue.capacitiesBarChartData title="" parentId="capacity-bar-chart" - textWidth=150 + textWidth=175 ratio=0.55 maxHeight=350}} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js index 7c9a1f8..b9da222 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js @@ -165,5 +165,11 @@ export default { unit = "GB"; } return value.toFixed(1) + " " + unit; + }, + floatToFixed: function(value, fixed=2) { + if (value && value.toFixed) { + return parseFloat(value.toFixed(fixed)); + } + return value; } };