From 0a4d8f658432c6350343700470c4334497c095c4 Mon Sep 17 00:00:00 2001 From: rohithsharmaks Date: Wed, 23 Dec 2015 09:12:32 +0530 Subject: [PATCH] YARN-4109. Exception on RM scheduler page loading with labels. (Mohammad Shahid Khan via rohithsharmaks) (cherry picked from commit 8c180a13c82ab9d60f595e6942e35d51024dab53) Conflicts: hadoop-yarn-project/CHANGES.txt --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/resourcemanager/webapp/CapacitySchedulerPage.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c7fc5566608..25ce86e24f5 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -11,6 +11,9 @@ Release 2.7.4 - UNRELEASED YARN-6457. Allow custom SSL configuration to be supplied in WebApps. (Sanjay M Pujare via haibochen) + YARN-4109. Exception on RM scheduler page loading with labels. + (Mohammad Shahid Khan via rohithsharmaks) + OPTIMIZATIONS YARN-5262. Optimize sending RMNodeFinishedContainersPulledByAMEvent for diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java index cf4dc1fd03b..844910d070b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java @@ -327,7 +327,7 @@ public void render(Block html) { used > 1 ? Q_OVER : Q_UNDER))._(".")._(). span(".q", partitionUiTag)._(). span().$class("qstats").$style(left(Q_STATS_POS)). - _(join(percent(used), " used"))._(); + _(join(percent(used), " used"))._()._(); //for the queue hierarchy under label UL underLabel = html.ul("#pq");