YARN-11756. [UI2] Add the metrics from UI1 scheduler/application queues page to UI2 Queues page (#7324)

Author: ferdelyi

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js

@@ -33,28 +33,52 @@ export default Ember.Component.extend({
   initData() {
     const queue = this.get("queue");
     const partitionMap = this.get("partitionMap");
-    const filteredParition = this.get("filteredPartition") || PARTITION_LABEL;
+    const resourceUsagesByPartitionMap = this.get("resourceUsagesByPartitionMap");
+    const filteredPartition = this.get("filteredPartition") || PARTITION_LABEL;
     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 orderingPolicy = queue.get("orderingPolicy");
+    const orderingPolicyInfo = queue.get("orderingPolicyInfo");
     const normalizedWeight = queue.get("normalizedWeight");
     const creationMethod = queue.get("creationMethod");
+    const numActiveApplications = queue.get("numActiveApplications");
+    const numPendingApplications = queue.get("numPendingApplications");
+    const numContainers = queue.get("numContainers");
+    const maxApplications = queue.get("maxApplications");
+    const maxApplicationsPerUser = queue.get("maxApplicationsPerUser");
+    const nodeLabels = queue.get("nodeLabels");
+    const defaultNodeLabelExpression = queue.get("defaultNodeLabelExpression");
+    const preemptionDisabled = queue.get("preemptionDisabled");
+    const intraQueuePreemptionDisabled = queue.get("intraQueuePreemptionDisabled");
+    const defaultPriority = queue.get("defaultPriority");
 
     return {
-      ...partitionMap[filteredParition],
+      ...partitionMap[filteredPartition],
+      ...resourceUsagesByPartitionMap[filteredPartition],
       userLimit,
       userLimitFactor,
       isLeafQueue,
       isWeightMode,
       weight,
       normalizedWeight,
-      orderingPolicy,
+      orderingPolicyInfo,
       creationMethod,
-      isFlexibleDynamicQueue
+      isFlexibleDynamicQueue,
+      numActiveApplications,
+      numPendingApplications,
+      numContainers,
+      maxApplications,
+      maxApplicationsPerUser,
+      userLimit,
+      userLimitFactor,
+      nodeLabels,
+      defaultNodeLabelExpression,
+      preemptionDisabled,
+      intraQueuePreemptionDisabled,
+      defaultPriority
     };
   }
 });

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js

@@ -27,6 +27,7 @@ export default DS.Model.extend({
   capacity: DS.attr("number"),
   partitions: DS.attr("array"),
   partitionMap: DS.attr("object"),
+  resourceUsagesByPartitionMap: DS.attr("object"),
   maxCapacity: DS.attr("number"),
   usedCapacity: DS.attr("number"),
   absCapacity: DS.attr("number"),
@@ -35,13 +36,20 @@ export default DS.Model.extend({
   weight: DS.attr("number"),
   normalizedWeight: DS.attr("number"),
   creationMethod: DS.attr("string"),
-  orderingPolicy: DS.attr("string"),
+  orderingPolicyInfo: DS.attr("string"),
   state: DS.attr("string"),
   userLimit: DS.attr("number"),
   userLimitFactor: DS.attr("number"),
-  preemptionDisabled: DS.attr("number"),
+  preemptionDisabled: DS.attr("string"),
+  intraQueuePreemptionDisabled: DS.attr("string"),
+  defaultPriority: DS.attr("number"),
   numPendingApplications: DS.attr("number"),
   numActiveApplications: DS.attr("number"),
+  numContainers: DS.attr("number"),
+  maxApplications: DS.attr("number"),
+  maxApplicationsPerUser: DS.attr("number"),
+  nodeLabels: DS.attr("string"),
+  defaultNodeLabelExpression: DS.attr("string"),
   users: DS.hasMany("YarnUser"),
   type: DS.attr("string"),
   resources: DS.attr("object"),

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js

@@ -83,7 +83,25 @@ export default DS.JSONAPISerializer.extend({
           usedCapacity: payload.usedCapacity,
           absoluteCapacity: 'absoluteCapacity' in payload ? payload.absoluteCapacity : payload.capacity,
           absoluteMaxCapacity: 'absoluteMaxCapacity' in payload ? payload.absoluteMaxCapacity : payload.maxCapacity,
-          absoluteUsedCapacity: 'absoluteUsedCapacity' in payload ? payload.absoluteUsedCapacity : payload.usedCapacity,
+          absoluteUsedCapacity: 'absoluteUsedCapacity' in payload ? payload.absoluteUsedCapacity : payload.usedCapacity
+        };
+      }
+
+      //add here the partitioninfo
+      ///scheduler/schedulerInfo/queues/queue[2]/resources/resourceUsagesByPartition/partitionName
+      //resources.resourceUsagesByPartition[].used.memory
+      var resourcePartitions = [];
+      var resourceUsagesByPartitionMap = {};
+      if ("resources" in payload){
+        resourcePartitions = payload.resources.resourceUsagesByPartition.map(
+          res => res.partitionName || PARTITION_LABEL);
+          resourceUsagesByPartitionMap = payload.resources.resourceUsagesByPartition.reduce((init, res) => {
+          init[res.partitionName || PARTITION_LABEL] = res;
+          return init;
+        }, {});
+      }else{
+        resourceUsagesByPartitionMap[PARTITION_LABEL] = {
+          partitionName: ""
         };
       }
 
@@ -105,15 +123,23 @@ export default DS.JSONAPISerializer.extend({
           normalizedWeight: payload.normalizedWeight,
           creationMethod: payload.creationMethod,
           state: payload.state,
-          orderingPolicy: payload.orderingPolicyInfo,
+          orderingPolicyInfo: payload.orderingPolicyInfo,
           userLimit: payload.userLimit,
           userLimitFactor: payload.userLimitFactor,
           preemptionDisabled: payload.preemptionDisabled,
+          intraQueuePreemptionDisabled: payload.intraQueuePreemptionDisabled,
           numPendingApplications: payload.numPendingApplications,
           numActiveApplications: payload.numActiveApplications,
+          numContainers: payload.numContainers,
+          maxApplications: payload.maxApplications,
+          maxApplicationsPerUser: payload.maxApplicationsPerUser,
+          nodeLabels: payload.nodeLabels,
+          defaultNodeLabelExpression: payload.defaultNodeLabelExpression,
           resources: payload.resources,
+          defaultPriority: payload.defaultPriority,
           partitions: partitions,
           partitionMap: partitionMap,
+          resourceUsagesByPartitionMap: resourceUsagesByPartitionMap,
           type: "capacity",
         },
         // Relationships