This is an automated email from the ASF dual-hosted git repository.

bteke 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 2c694e15cc4 YARN-11756. [UI2] Add the metrics from UI1 
scheduler/application queues page to UI2 Queues page (#7324)
2c694e15cc4 is described below

commit 2c694e15cc44f71b2dd56f85248fe529f9ef9f8c
Author: Ferenc Erdelyi <55103964+ferde...@users.noreply.github.com>
AuthorDate: Mon Feb 24 15:25:06 2025 +0100

    YARN-11756. [UI2] Add the metrics from UI1 scheduler/application queues 
page to UI2 Queues page (#7324)
---
 .../yarn-queue-partition-capacity-labels.js        |  34 ++-
 .../webapp/app/models/yarn-queue/capacity-queue.js |  12 +-
 .../app/serializers/yarn-queue/capacity-queue.js   |  30 ++-
 .../yarn-queue-partition-capacity-labels.hbs       | 295 +++++++++++++++++----
 .../components/yarn-queue/capacity-queue.hbs       |   2 +-
 5 files changed, 311 insertions(+), 62 deletions(-)

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 788155c3877..6e8e3d0e68a 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
@@ -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
     };
   }
 });
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 c05b666e6df..f0c8e693351 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
@@ -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"),
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 1c58547e004..212bab795d3 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
@@ -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
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 a84538da8d2..9aad6d42a6a 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
@@ -16,59 +16,250 @@
  * limitations under the License.
 }}
 
-<div class="top-1">
-  <span class="yarn-label primary">
-    <span class="label-key">absolute used</span>
+<h4>Queue Status for Partition</h4>
+{{!
+/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[2]/used/resourceInformations/resourceInformation[1]/name[text()='memory-mb']
+/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[2]/used/resourceInformations/resourceInformation[1]/value/text('2048')
+/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition/usedCapacity[text()='37.883835']
+}}
+<ul>
+  <li class="queues-list">
+    <span class="label-key" title="Used Capacity/Resources: is the total of 
the resources consumed within the queue for the given partition <memory MB, 
vCores, %>.
+    The percentage value calculated differently for the 
DefaultResourceCalculator and for the DominantResourceCalculator."><b>used 
capacity:</b></span>
+    <span class="label-value"><b>{{data.usedCapacity}}%</b></span>
+    <span class="label-value"><ul>{{#each 
data.used.resourceInformations.resourceInformation as | 
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+  </li>
+
+  {{#if data.isWeightMode}}
+
+    <li class="yarn-list">
+      <span class="label-key" title="Configured Weight">weight:</span>
+      <span class="label-value">{{data.weight}}</span>
+    </li>
+    <li class="yarn-list">
+      <span class="label-key" title="Normalized Weight">normalized 
weight:</span>
+      <span class="label-value">{{data.normalizedWeight}}</span>
+    </li>
+
+  {{else}}
+
+    {{!
+    
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition[2]/capacity[text()='85.44922']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Configured Capacity: percentage = 
'configured resources of the queue' / 'total available resources for the 
partition' * 100">configured capacity:</span>
+      <span class="label-value">{{data.capacity}}%</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/maxCapacity[text()='100.0']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Configured Max Capacity: percentage = 
'configured maximum resources of the queue' / 'total available resources for 
the partition' * 100">configured max capacity:</span>
+      <span class="label-value">{{data.maxCapacity}}%</span>
+    </li>
+
+  {{/if}}
+
+  {{!
+  
/scheduler/schedulerInfo/queues/queue[1]/capacities/queueCapacitiesByPartition[1]/effectiveMinResource/resourceInformations/resourceInformation[1]/name[text()='memory-mb']
+  
/scheduler/schedulerInfo/queues/queue[1]/capacities/queueCapacitiesByPartition[1]/effectiveMinResource/resourceInformations/resourceInformation[1]/value[text()='2703']
+  
/scheduler/schedulerInfo/queues/queue[1]/capacities/queueCapacitiesByPartition[1].capacity/name[text()='100']
+  }}
+  <li class="yarn-list">
+    <span class="label-key"  title="Effective min capacity">effective 
capacity:</span>
+    <span class="label-value">{{data.capacity}}%</span>
+    <span class="label-value"><ul>{{#each 
data.effectiveMinResource.resourceInformations.resourceInformation as | 
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+  </li>
+
+  {{!
+  
/scheduler/schedulerInfo/queues/queue[1]/capacities/queueCapacitiesByPartition[1]/effectiveMaxResource/resourceInformations/resourceInformation[1]/name[text()='memory-mb']
+  
/scheduler/schedulerInfo/queues/queue[1]/capacities/queueCapacitiesByPartition[1]/effectiveMaxResource/resourceInformations/resourceInformation[1]/value[text()='2703']
+  
/scheduler/schedulerInfo/queues/queue[1]/capacities/queueCapacitiesByPartition[1].maxCapacity/name[text()='100']
+  }}
+  <li class="yarn-list">
+    <span class="label-key"  title="Effective max capacity">effective max 
capacity:</span>
+    <span class="label-value">{{data.maxCapacity}}%</span>
+    <span class="label-value"><ul> {{#each 
data.effectiveMaxResource.resourceInformations.resourceInformation as | 
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+  </li>
+
+  <li class="yarn-list">
+    <span class="label-key" title="Absolute Used Capacity: percentage 
referring to the used resources from the total available resources for the 
partition">absolute used capacity:</span>
     <span class="label-value">{{data.absoluteUsedCapacity}}%</span>
-  </span>
-  <span class="yarn-label primary">
-    <span class="label-key">absolute capacity</span>
+  </li>
+
+  {{!
+  
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition[2]/absoluteCapacity[text()='85.44922']
+  }}
+  <li class="yarn-list">
+    <span class="label-key" title="Absolute Configured Capacity: percentage 
referring to the configured resources from the total available resources for 
the partition. This value  will be different from the configured capacity only 
when the parent queue is not the root queue.">absolute configured 
capacity:</span>
     <span class="label-value">{{data.absoluteCapacity}}%</span>
-  </span>
-  <span class="yarn-label secondary">
-    <span class="label-key">absolute max capacity</span>
+  </li>
+
+  {{!
+  /scheduler/schedulerInfo/queues/queue[2]/absoluteMaxCapacity[text()='100.0']
+  }}
+  <li class="yarn-list">
+    <span class="label-key" title="Absolute Configured Max Capacity: 
percentage referring to the configured maximum resources from the total 
available resources for the partition. This value will be different from the 
configured max capacity only when the parent queue is not the root 
queue.">absolute configured max capacity:</span>
     <span class="label-value">{{data.absoluteMaxCapacity}}%</span>
-  </span>
-</div>
-{{#if data.isWeightMode}}
-<div class="top-1">
-  <span class="yarn-label secondary">
-    <span class="label-key">weight</span>
-    <span class="label-value">{{data.weight}}</span>
-  </span>
-  <span class="yarn-label secondary">
-    <span class="label-key">normalized weight</span>
-    <span class="label-value">{{data.normalizedWeight}}</span>
-  </span>
-</div>
-{{else}}
-<div class="top-1">
-  <span class="yarn-label secondary">
-    <span class="label-key">configured capacity</span>
-    <span class="label-value">{{data.capacity}}%</span>
-  </span>
-  <span class="yarn-label secondary">
-    <span class="label-key">configured max capacity</span>
-    <span class="label-value">{{data.maxCapacity}}%</span>
-  </span>
-</div>
-{{/if}}
+  </li>
+
+  {{!
+  
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition/maxAMLimitPercentage[text()='10.0']
+  }}
+  <li class="yarn-list">
+    <span class="label-key" title="Configured Max Application Master 
Limit">configured max application master limit:</span>
+    <span class="label-value">{{data.maxAMLimitPercentage}}%</span>
+  </li>
+
+  {{#if data.isLeafQueue}}
+    {{!
+    
/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[1]/amLimit/resourceInformations/resourceInformation[1]/name[text()='memory-mb']
+    
/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[1]/amLimit/resourceInformations/resourceInformation[1]/value[text()='3072']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Max Application Master Resources">max 
application master resources:</span>
+      <span class="label-value"><ul>{{#each 
data.amLimit.resourceInformations.resourceInformation as | 
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+    </li>
+
+    {{!
+    
/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[2]/amUsed/resourceInformations/resourceInformation[1]/name[text()='memory-mb']
+    
/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[2]/amUsed/resourceInformations/resourceInformation[1]/value[text()='1024']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Used Application Master Resources">used 
application master resources:</span>
+      <span class="label-value"><ul>{{#each 
data.amUsed.resourceInformations.resourceInformation as | 
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+    </li>
+
+    {{!
+    
/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[2]/userAmLimit/resourceInformations/resourceInformation[1]/name[text()='memory-mb']
+    
/scheduler/schedulerInfo/queues/queue[1]/resources/resourceUsagesByPartition[2]/userAmLimit/resourceInformations/resourceInformation[1]/value[text()='0']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Max Application Master Resources Per 
User">max application master resources per user:</span>
+      <span class="label-value"><ul>{{#each 
data.userAmLimit.resourceInformations.resourceInformation as | 
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+    </li>
+  {{/if}}
+</ul>
+
 {{#if data.isLeafQueue}}
-<div class="top-1">
-  <span class="yarn-label secondary">
-    <span class="label-key">user limit</span>
-    <span class="label-value">{{data.userLimit}}%</span>
-  </span>
-  <span class="yarn-label secondary">
-    <span class="label-key">user limit factor</span>
-    <span class="label-value">{{data.userLimitFactor}}</span>
-  </span>
-</div>
-{{/if}}
-{{#if data.isFlexibleDynamicQueue}}
-<div class="top-1">
-  <span class="yarn-label secondary">
-    <span class="label-key">flexible dynamic queue</span>
-  </span>
-</div>
-{{/if}}
+  <h4>Queue Status</h4>
+  <ul>
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/numActiveApplications[text()='1']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Num Schedulable Applications. Shows the 
#apps running in the queue regardless of the partition.">num schedulable 
applications:</span>
+      <span class="label-value">{{data.numActiveApplications}}</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/numPendingApplications[text()='0']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Non-Schedulable Applications. Shows the 
#apps pending in the queue regardless of the partition.">num non-schedulable 
spplications:</span>
+      <span class="label-value">{{data.numPendingApplications}}</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/numContainers[text()='2']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Number of Containers">num 
containers:</span>
+      <span class="label-value">{{data.numContainers}}</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/maxApplications[text()='3299']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Max Applications">max applications:</span>
+      <span class="label-value">{{data.maxApplications}}</span>
+    </li>
+
+    {{!
+    
/scheduler/schedulerInfo/queues/queue[2]/maxApplicationsPerUser[text()='3299']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Max Applications Per User">max 
applications per user:</span>
+      <span class="label-value">{{data.maxApplicationsPerUser}}</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/userLimitFactor[text()='1.0']
+    }}
+    <li class="yarn-list" title="Configured Minimum User Limit Percent">
+      <span class="label-key">configured minimum user limit percent:</span>
+      <span class="label-value">{{data.userLimit}}%</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/userLimit[text()='100.0']
+    }}
+    <li class="yarn-list" title="Configured User Limit Factor">
+      <span class="label-key">configured user limit factor:</span>
+      <span class="label-value">{{data.userLimitFactor}}</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/nodeLabels[text()='*']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Accessible Node Labels">accessible node 
labels:</span>
+      <span class="label-value">{{data.nodeLabels}}</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/orderingPolicyInfo[text()='fifo']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Ordering Policy">ordering policy:</span>
+      <span class="label-value">{{data.orderingPolicyInfo}}</span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/preemptionDisabled[text()='false']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Preemption Disabled">preemption 
disabled:</span>
+      <span class="label-value">{{data.preemptionDisabled}}</span>
+    </li>
+
+    {{!
+    
/scheduler/schedulerInfo/queues/queue[2]/intraQueuePreemptionDisabled[text()='true']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Intra-queue Preemption 
Disabled">intra-queue preemption disabled:</span>
+      <span class="label-value">{{data.intraQueuePreemptionDisabled}}</span>
+    </li>
+
+    {{!
+    
/scheduler/schedulerInfo/queues/queue[3]/queues/queue[1]/defaultNodeLabelExpression[text()='exclusive']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Default Node Label Expression:">default 
node label expression:</span>
+      <span class="label-value">
+            {{#if data.defaultNodeLabelExpression}}
+              {{data.defaultNodeLabelExpression}}
+            {{else}}
+              &lt;DEFAULT_PARTITION&gt;
+            {{/if}}
+      </span>
+    </li>
+
+    {{!
+    /scheduler/schedulerInfo/queues/queue[2]/defaultPriority[text()='0']
+    }}
+    <li class="yarn-list">
+      <span class="label-key" title="Default Application Priority">default 
application priority:</span>
+      <span class="label-value">{{data.defaultPriority}}</span>
+    </li>
+
+    {{#if data.isFlexibleDynamicQueue}}
+      <li class="yarn-list">
+        <span class="label-key" title="Flexible Dynamic Queue">flexible 
dynamic queue:</span>
+        <span class="label-value">{{data.isFlexibleDynamicQueue}}</span>
+      </li>
+    {{/if}}
+  </ul>
+{{/if}}
\ No newline at end of file
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
index 6615b1dbd4a..e9fc80e1c64 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
@@ -32,7 +32,7 @@
       </div>
     {{/if}}
 
-    {{yarn-queue-partition-capacity-labels 
partitionMap=model.selectedQueue.partitionMap queue=model.selectedQueue 
filteredPartition=filteredPartition}}
+    {{yarn-queue-partition-capacity-labels 
partitionMap=model.selectedQueue.partitionMap 
resourceUsagesByPartitionMap=model.selectedQueue.resourceUsagesByPartitionMap 
queue=model.selectedQueue filteredPartition=filteredPartition}}
   </div>
 
   <h5> Running Apps From All Users in Queue </h5>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to