This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push: new 4fa0de9 YARN-9626. UI2 - Fair scheduler queue apps page issues. Contributed by Zoltan Siegl 4fa0de9 is described below commit 4fa0de9f04877b60137f4995124cee4ca0acf707 Author: Szilard Nemeth <snem...@apache.org> AuthorDate: Fri Jul 12 17:40:14 2019 +0200 YARN-9626. UI2 - Fair scheduler queue apps page issues. Contributed by Zoltan Siegl (cherry picked from commit 557056e18ea3d5b3fe3046f0ea4b4c7345ea21c5) --- .../yarn-queue/fair-queue-conf-table.hbs | 2 +- .../src/main/webapp/app/templates/yarn-queue.hbs | 44 +++++++++++----------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs index b2448cf..fba7a55 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs @@ -38,7 +38,7 @@ </tr> <tr> <td>Pending, Allocated, Reserved Containers</td> - <td>{{queue.pendingContainers}} , {{queue.allocatedContainers}} , {{queue.reservedContainers}}</td> + <td>{{#if queue.pendingContainers}}{{queue.pendingContainers}}{{else}}0{{/if}}, {{#if queue.allocatedContainers}}{{queue.allocatedContainers}}{{else}}0{{/if}}, {{#if queue.reservedContainers}}{{queue.reservedContainers}}{{else}}0{{/if}}</td> </tr> <tr> <td>Scheduling Policy</td> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs index 756ef69..8024ffa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs @@ -29,32 +29,34 @@ {{em-table-simple-status-cell content=model.selectedQueue.state}} </div> {{/if}} - <div class="top-1"> - <span class="yarn-label secondary"> - <span class="label-key">configured capacity</span> - <span class="label-value">{{model.selectedQueue.capacity}}%</span> - </span> - <span class="yarn-label secondary"> - <span class="label-key">configured max capacity</span> - <span class="label-value">{{model.selectedQueue.maxCapacity}}%</span> - </span> - {{#if model.selectedQueue.isLeafQueue}} - <span class="yarn-label secondary"> - <span class="label-key">user limit</span> - <span class="label-value">{{model.selectedQueue.userLimit}}%</span> - </span> - <span class="yarn-label secondary"> - <span class="label-key">user limit factor</span> - <span class="label-value">{{model.selectedQueue.userLimitFactor}}</span> - </span> - {{/if}} - </div> + {{#if (eq model.queues.firstObject.type "capacity")}} + <div class="top-1"> + <span class="yarn-label secondary"> + <span class="label-key">configured capacity</span> + <span class="label-value">{{model.selectedQueue.capacity}}%</span> + </span> + <span class="yarn-label secondary"> + <span class="label-key">configured max capacity</span> + <span class="label-value">{{model.selectedQueue.maxCapacity}}%</span> + </span> + {{#if model.selectedQueue.isLeafQueue}} + <span class="yarn-label secondary"> + <span class="label-key">user limit</span> + <span class="label-value">{{model.selectedQueue.userLimit}}%</span> + </span> + <span class="yarn-label secondary"> + <span class="label-key">user limit factor</span> + <span class="label-value">{{model.selectedQueue.userLimitFactor}}</span> + </span> + {{/if}} + </div> + {{/if}} </div> <div class="flex-right"> {{#each model.selectedQueue.capacitiesBarChartData as |item|}} <span class="yarn-label primary"> <span class="label-key"> {{lower item.label}}</span> - <span class="label-value">{{item.value}}%</span> + <span class="label-value">{{item.value}}{{#if (eq model.queues.firstObject.type "fair")}} MB{{else}}%{{/if}}</span> </span> {{/each}} </div> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org