YARN-6386. Show decommissioning nodes in new YARN UI. Contributed by Elek Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65b90e1e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65b90e1e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65b90e1e Branch: refs/heads/YARN-3368_branch2 Commit: 65b90e1e1c512efb74aabb8861ebfc13c8eef8fd Parents: 1a1f39c Author: Sunil G <sun...@apache.org> Authored: Tue Aug 29 16:51:14 2017 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Wed Oct 18 02:06:49 2017 +0530 ---------------------------------------------------------------------- .../main/webapp/app/models/cluster-metric.js | 9 ++++-- .../src/main/webapp/app/models/yarn-rm-node.js | 2 +- .../webapp/app/templates/cluster-overview.hbs | 33 ++++++++++---------- .../main/webapp/app/templates/yarn-nodes.hbs | 2 +- 4 files changed, 26 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js index bc6e27a..dcc0c29 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js @@ -39,6 +39,7 @@ export default DS.Model.extend({ totalNodes: DS.attr('number'), lostNodes: DS.attr('number'), unhealthyNodes: DS.attr('number'), + decommissioningNodes: DS.attr('number'), decommissionedNodes: DS.attr('number'), rebootedNodes: DS.attr('number'), activeNodes: DS.attr('number'), @@ -87,11 +88,15 @@ export default DS.Model.extend({ value: this.get("unhealthyNodes") }); arr.push({ + label: "Decommissioning", + value: this.get("decommissioningNodes") + }); + arr.push({ label: "Decomissioned", value: this.get("decommissionedNodes") }); return arr; - }.property("activeNodes", "unhealthyNodes", "decommissionedNodes"), + }.property("activeNodes", "unhealthyNodes", "decommissioningNodes", "decommissionedNodes"), getMemoryDataForDonutChart: function() { var type = "MB"; @@ -130,4 +135,4 @@ export default DS.Model.extend({ return arr; }.property("allocatedVirtualCores", "reservedVirtualCores", "availableVirtualCores"), -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js index 461bf00..6baeca2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js @@ -53,7 +53,7 @@ export default DS.Model.extend({ nodeStateStyle: function() { var style = "default"; var nodeState = this.get("state"); - if (nodeState === "REBOOTED") { + if (nodeState === "REBOOTED" || nodeState === "DECOMMISSIONING") { style = "warning"; } else if (nodeState === "UNHEALTHY" || nodeState === "DECOMMISSIONED" || nodeState === "LOST" || nodeState === "SHUTDOWN") { http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs index ac8f20a..e549ce5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs @@ -86,22 +86,6 @@ </div> </div> </div> - - <div class="col-lg-4 container-fluid"> - <div class="panel panel-default"> - <div class="panel-heading"> - Node Managers - </div> - <div class="container-fluid" id="nodes-donut-chart"> - {{donut-chart data=model.clusterMetrics.firstObject.getNodesDataForDonutChart - showLabels=true - parentId="nodes-donut-chart" - ratio=0.6 - maxHeight=350 - colorTargets="good error warn"}} - </div> - </div> - </div> </div> <hr> @@ -142,6 +126,23 @@ </div> </div> </div> + <div class="row"> + <div class="col-lg-6 container-fluid"> + <div class="panel panel-default"> + <div class="panel-heading"> + Node Managers + </div> + <div class="container-fluid" id="nodes-donut-chart"> + {{donut-chart data=model.clusterMetrics.firstObject.getNodesDataForDonutChart + showLabels=true + parentId="nodes-donut-chart" + ratio=0.6 + maxHeight=350 + colorTargets="good error warn"}} + </div> + </div> + </div> + </div> </div> {{/if}} http://git-wip-us.apache.org/repos/asf/hadoop/blob/65b90e1e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs index 795d00e..79d9efa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs @@ -47,7 +47,7 @@ <div class="col-md-10 container-fluid"> {{#if model.clusterMetrics}} <div class="row"> - <div class="col-lg-5 container-fluid"> + <div class="col-lg-6 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"> Node Managers --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
