diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js index e7f9c03f356..30a82938148 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js @@ -37,12 +37,22 @@ export default Ember.Component.extend({ const userLimit = queue.get("userLimit"); const userLimitFactor = queue.get("userLimitFactor"); const isLeafQueue = queue.get("isLeafQueue"); + const isWeightMode = queue.get("isWeightMode"); + const isFlexibleDynamicQueue = queue.get("isFlexibleDynamicQueue"); + const weight = queue.get("weight"); + const normalizedWeight = queue.get("normalizedWeight"); + const creationMethod = queue.get("creationMethod"); return { ...partitionMap[filteredParition], userLimit, userLimitFactor, - isLeafQueue + isLeafQueue, + isWeightMode, + weight, + normalizedWeight, + creationMethod, + isFlexibleDynamicQueue }; } }); 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 ebcccb9eec3..b96ca955801 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 @@ -31,6 +31,9 @@ export default DS.Model.extend({ absCapacity: DS.attr("number"), absMaxCapacity: DS.attr("number"), absUsedCapacity: DS.attr("number"), + weight: DS.attr("number"), + normalizedWeight: DS.attr("number"), + creationMethod: DS.attr("string"), state: DS.attr("string"), userLimit: DS.attr("number"), userLimitFactor: DS.attr("number"), @@ -49,6 +52,14 @@ export default DS.Model.extend({ return len <= 0; }.property("children"), + isWeightMode: function() { + return this.get("weight") !== -1; + }.property("children"), + + isFlexibleDynamicQueue: function() { + return this.get("creationMethod") === "dynamicFlexible"; + }.property("children"), + capacitiesBarChartData: function() { var floatToFixed = Converter.floatToFixed; return [ 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 2dec5205fdd..5505270ea7d 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 @@ -100,6 +100,9 @@ export default DS.JSONAPISerializer.extend({ absCapacity: payload.absoluteCapacity, absMaxCapacity: payload.absoluteMaxCapacity, absUsedCapacity: payload.absoluteUsedCapacity, + weight: payload.weight, + normalizedWeight: payload.normalizedWeight, + creationMethod: payload.creationMethod, state: payload.state, userLimit: payload.userLimit, userLimitFactor: payload.userLimitFactor, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs index fdecb2de310..a84538da8d2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs @@ -30,6 +30,18 @@ {{data.absoluteMaxCapacity}}% +{{#if data.isWeightMode}} +