Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs (date 1562671320000)
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs (date 1562760613000)
@@ -38,7 +38,7 @@
| Pending, Allocated, Reserved Containers |
- {{queue.pendingContainers}} , {{queue.allocatedContainers}} , {{queue.reservedContainers}} |
+ {{#if queue.pendingContainers}}{{queue.pendingContainers}}{{else}}0{{/if}}, {{#if queue.allocatedContainers}}{{queue.allocatedContainers}}{{else}}0{{/if}}, {{#if queue.reservedContainers}}{{queue.reservedContainers}}{{else}}0{{/if}} |
| Scheduling Policy |
Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs (date 1562671320000)
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs (date 1562761643000)
@@ -29,32 +29,34 @@
{{em-table-simple-status-cell content=model.selectedQueue.state}}
{{/if}}
-
-
- configured capacity
- {{model.selectedQueue.capacity}}%
-
-
- configured max capacity
- {{model.selectedQueue.maxCapacity}}%
-
- {{#if model.selectedQueue.isLeafQueue}}
-
- user limit
- {{model.selectedQueue.userLimit}}%
-
-
- user limit factor
- {{model.selectedQueue.userLimitFactor}}
-
- {{/if}}
-
+ {{#if (eq model.queues.firstObject.type "capacity")}}
+
+
+ configured capacity
+ {{model.selectedQueue.capacity}}%
+
+
+ configured max capacity
+ {{model.selectedQueue.maxCapacity}}%
+
+ {{#if model.selectedQueue.isLeafQueue}}
+
+ user limit
+ {{model.selectedQueue.userLimit}}%
+
+
+ user limit factor
+ {{model.selectedQueue.userLimitFactor}}
+
+ {{/if}}
+
+ {{/if}}
{{#each model.selectedQueue.capacitiesBarChartData as |item|}}
{{lower item.label}}
- {{item.value}}%
+ {{item.value}}{{#if (eq model.queues.firstObject.type "fair")}} MB{{else}}%{{/if}}
{{/each}}