This is an automated email from the ASF dual-hosted git repository. zhuqi pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new e634bf3 YARN-10630. [UI2] Ambiguous queue name resolution (#3214) e634bf3 is described below commit e634bf33f3dde89b9282a617f271dd31e9aca436 Author: 9uapaw <gyora...@gmail.com> AuthorDate: Wed Jul 21 04:06:46 2021 +0200 YARN-10630. [UI2] Ambiguous queue name resolution (#3214) Co-authored-by: Andras Gyori <gand...@cloudera.com> --- .../src/main/webapp/app/components/tree-selector.js | 14 +++++++------- .../main/webapp/app/models/yarn-queue/capacity-queue.js | 2 +- .../webapp/app/serializers/yarn-queue/capacity-queue.js | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) 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 9becfc1..a85dff2 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 @@ -160,9 +160,9 @@ export default Ember.Component.extend({ .on( "click", function(d) { - if (d.queueData.get("name") !== this.get("selected")) { + if (d.queueData.get("queuePath") !== this.get("selected")) { document.location.href = - "#/yarn-queues/" + d.queueData.get("name") + "!"; + "#/yarn-queues/" + d.queueData.get("queuePath") + "!"; } Ember.run.later( @@ -183,7 +183,7 @@ export default Ember.Component.extend({ ) .on("dblclick", function(d) { document.location.href = - "#/yarn-queue/" + d.queueData.get("name") + "/apps"; + "#/yarn-queue/" + d.queueData.get("queuePath") + "/apps"; }); nodeEnter @@ -235,7 +235,7 @@ export default Ember.Component.extend({ .attr("dy", "45px") .attr("text-anchor", "middle") .text(function(d) { - return d.name; + return d.queueData.get("name"); }) .style("fill-opacity", 1e-6); @@ -251,12 +251,12 @@ export default Ember.Component.extend({ .select("circle") .attr("r", 30) .attr("href", function(d) { - return "#/yarn-queues/" + d.queueData.get("name"); + return "#/yarn-queues/" + d.queueData.get("queuePath"); }) .style( "stroke-width", function(d) { - if (d.queueData.get("name") === this.get("selected")) { + if (d.queueData.get("queuePath") === this.get("selected")) { return 7; } else { return 2; @@ -266,7 +266,7 @@ export default Ember.Component.extend({ .style( "stroke", function(d) { - if (d.queueData.get("name") === this.get("selected")) { + if (d.queueData.get("queuePath") === this.get("selected")) { return "gray"; } else { return "gray"; 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 885c6a5..c05b666 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 @@ -21,7 +21,7 @@ import Converter from 'yarn-ui/utils/converter'; export default DS.Model.extend({ name: DS.attr("string"), - path: DS.attr("string"), + queuePath: DS.attr("string"), children: DS.attr("array"), parent: DS.attr("string"), capacity: DS.attr("number"), diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js index e9ce25d..1c58547 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js @@ -26,7 +26,7 @@ export default DS.JSONAPISerializer.extend({ var children = []; if (payload.queues && payload.queues.queue) { payload.queues.queue.forEach(function(queue) { - children.push(queue.queueName); + children.push(queue.queuePath); }); } @@ -40,10 +40,10 @@ export default DS.JSONAPISerializer.extend({ var maxAMResource = defaultPartitionResource.amLimit; includedData.push({ type: "YarnUser", - id: u.username + "_" + payload.queueName, + id: u.username + "_" + payload.queuePath, attributes: { name: u.username, - queueName: payload.queueName, + queueName: payload.queuePath, usedMemoryMB: u.resourcesUsed.memory || 0, usedVCore: u.resourcesUsed.vCores || 0, maxMemoryMB: u.userResourceLimit.memory || 0, @@ -60,7 +60,7 @@ export default DS.JSONAPISerializer.extend({ relationshipUserData.push({ type: "YarnUser", - id: u.username + "_" + payload.queueName, + id: u.username + "_" + payload.queuePath, }); }); } @@ -92,7 +92,7 @@ export default DS.JSONAPISerializer.extend({ type: primaryModelClass.modelName, // yarn-queue attributes: { name: payload.queueName, - path: payload.queuePath, + queuePath: payload.queuePath, parent: payload.myParent, children: children, capacity: payload.capacity, @@ -141,9 +141,9 @@ export default DS.JSONAPISerializer.extend({ if (payload.queues && payload.queues.queue) { for (var i = 0; i < payload.queues.queue.length; i++) { var queue = payload.queues.queue[i]; - queue.myParent = payload.queueName; + queue.myParent = payload.queuePath; var childResult = this.handleQueue(store, primaryModelClass, queue, - queue.queueName, + queue.queuePath, requestType); data = data.concat(childResult.data); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org