From 08ddb536ebe864621e01ae78264f0dcfef5d20b1 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) --- 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 66f0f5205f0..b6624e8dd0d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -22,6 +22,9 @@ Release 2.9.0 - UNRELEASED BUG FIXES + YARN-4109. Exception on RM scheduler page loading with labels. + (Mohammad Shahid Khan via rohithsharmaks) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES 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 1cedac4294e..b4114de7385 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 @@ -408,7 +408,7 @@ class CapacitySchedulerPage extends RmView { 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");