Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E5EA1181CF for ; Tue, 28 Jul 2015 00:12:31 +0000 (UTC) Received: (qmail 95547 invoked by uid 500); 28 Jul 2015 00:12:31 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 95479 invoked by uid 500); 28 Jul 2015 00:12:31 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 95470 invoked by uid 99); 28 Jul 2015 00:12:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2015 00:12:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 812AAE01FB; Tue, 28 Jul 2015 00:12:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianhe@apache.org To: common-commits@hadoop.apache.org Message-Id: <5b477948de134168a2c3b4c3832f14eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3846. RM Web UI queue filter is not working for sub queue. Contributed by Mohammad Shahid Khan (cherry picked from commit 3572ebd738aa5fa8b0906d75fb12cc6cbb991573) Date: Tue, 28 Jul 2015 00:12:31 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 9da487e0f -> 7c123accd YARN-3846. RM Web UI queue filter is not working for sub queue. Contributed by Mohammad Shahid Khan (cherry picked from commit 3572ebd738aa5fa8b0906d75fb12cc6cbb991573) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7c123acc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7c123acc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7c123acc Branch: refs/heads/branch-2 Commit: 7c123accdac370db77831d3d64a9c9ccdc07fe74 Parents: 9da487e Author: Jian He Authored: Mon Jul 27 16:57:11 2015 -0700 Committer: Jian He Committed: Mon Jul 27 17:12:24 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/resourcemanager/webapp/CapacitySchedulerPage.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c123acc/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 724ddd0..4c6ccb7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -643,6 +643,9 @@ Release 2.8.0 - UNRELEASED YARN-3958. TestYarnConfigurationFields should be moved to hadoop-yarn-api module. (Varun Saxena via aajisaka) + YARN-3846. RM Web UI queue filter is not working for sub queue. + (Mohammad Shahid Khan via jianhe) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c123acc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java ---------------------------------------------------------------------- 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 12a3013..d8971b7 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 @@ -516,7 +516,10 @@ class CapacitySchedulerPage extends RmView { " $('#cs').bind('select_node.jstree', function(e, data) {", " var q = $('.q', data.rslt.obj).first().text();", " if (q == 'Queue: root') q = '';", - " else q = '^' + q.substr(q.lastIndexOf(':') + 2) + '$';", + " else {", + " q = q.substr(q.lastIndexOf(':') + 2);", + " q = '^' + q.substr(q.lastIndexOf('.') + 1) + '$';", + " }", " $('#apps').dataTable().fnFilter(q, 4, true);", " });", " $('#cs').show();",