brumi1024 commented on code in PR #7324:
URL: https://github.com/apache/hadoop/pull/7324#discussion_r1949588864
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs:
##########
@@ -16,59 +16,255 @@
* 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=" Aka. 'Used 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>
+
+
+ <li class="yarn-list">
+ <span class="label-key" title="Absolute Used Capacity: percentage
referring to the used memory from the total available memory for the
partition">absolute used:</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 memory from the total available memory 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 memory from the total available
memory 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>
+
+
+ {{#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 memory of the queue' / 'total available memory for the partition' *
100">configured capacity:</span>
Review Comment:
Is this memory only? What if dominant resource calculator is used? Then the
capacity would be configured resources of the queue / total available resources
for parent queue per the partition.
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs:
##########
@@ -16,59 +16,255 @@
* 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=" Aka. 'Used 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>
+
+
+ <li class="yarn-list">
+ <span class="label-key" title="Absolute Used Capacity: percentage
referring to the used memory from the total available memory for the
partition">absolute used:</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 memory from the total available memory 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 memory from the total available
memory 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>
+
+
+ {{#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 memory of the queue' / 'total available memory 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 memory of the queue' / 'total available memory for the
partition' * 100">configured max capacity:</span>
+ <span class="label-value">{{data.maxCapacity}}%</span>
+ </li>
+
+ {{!
+
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition/configuredMinResource/memory[text()='54060']
+
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition/configuredMinResource/vCores[text()='5']
+ }}
+ <li class="yarn-list">
+ <span class="label-key" title="Configured min capacity">configured min
capacity:</span>
+ <span class="label-value"><ul>{{#each
data.configuredMinResource.resourceInformations.resourceInformation as |
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+ </li>
+
+ {{!
+
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition/configuredMaxResource/memory[text()='163840']
+
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition/configuredMaxResource/vCores[text()='16']
+ }}
+ <li class="yarn-list">
+ <span class="label-key" title="Configured max capacity">configured max
capacity:</span>
+ <span class="label-value"><ul>{{#each
data.configuredMaxResource.resourceInformations.resourceInformation as |
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></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']
+ }}
+
+ <li class="yarn-list">
+ <span class="label-key" title="Effective min capacity">effective min
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']
+ }}
+ <li class="yarn-list">
+ <span class="label-key" title="Effective max capacity">effective max
capacity:</span>
+ <span class="label-value"><ul>{{#each
data.effectiveMaxResource.resourceInformations.resourceInformation as |
resource|}}<li>{{resource.name}}: {{resource.value}}</li>{{/each}}</ul></span>
+ </li>
+
+ {{!
+
/scheduler/schedulerInfo/queues/queue[2]/capacities/queueCapacitiesByPartition/maxAMLimitPercentage[text()='10.0']
+ }}
+ <li class="yarn-list">
+ <span class="label-key" title="Aka. Configured Max Application Master
Limit">max am limit percentage:</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 am
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
am 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 am 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="Aka.: Num Schedulable Applications. Shows
the #apps running in the queue regardless of the partition.">#active
applications:</span>
Review Comment:
Nit: Just for the sake of consistency: a bit above the punctuation is Aka.
and the name is in quotation marks, then comes the colon. Here the colon is
right after the Aka. I'm fine with either, but it would look better if the same
convention is followed throughout the similar text fields.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
