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 677E318024 for ; Wed, 1 Jul 2015 10:45:40 +0000 (UTC) Received: (qmail 11167 invoked by uid 500); 1 Jul 2015 10:45:33 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 10906 invoked by uid 500); 1 Jul 2015 10:45:33 -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 10247 invoked by uid 99); 1 Jul 2015 10:45:33 -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; Wed, 01 Jul 2015 10:45:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1CAEEE0508; Wed, 1 Jul 2015 10:45:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vvasudev@apache.org To: common-commits@hadoop.apache.org Date: Wed, 01 Jul 2015 10:45:44 -0000 Message-Id: <585378c220924cd3bd4fba5fa9a83d57@git.apache.org> In-Reply-To: <83a8238545f945b08abdc9b5a131f831@git.apache.org> References: <83a8238545f945b08abdc9b5a131f831@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] hadoop git commit: YARN-3859. LeafQueue doesn't print user properly for application add. Contributed by Varun Saxena. YARN-3859. LeafQueue doesn't print user properly for application add. Contributed by Varun Saxena. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b543d1a3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b543d1a3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b543d1a3 Branch: refs/heads/YARN-2139 Commit: b543d1a390a67e5e92fea67d3a2635058c29e9da Parents: 79ed0f9 Author: Devaraj K Authored: Sun Jun 28 10:04:50 2015 +0530 Committer: Devaraj K Committed: Sun Jun 28 10:04:50 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b543d1a3/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index e2bf706..cb6deb1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -562,6 +562,9 @@ Release 2.8.0 - UNRELEASED YARN-2871. TestRMRestart#testRMRestartGetApplicationList sometime fails in trunk. (zhihai xu via xgong) + YARN-3859. LeafQueue doesn't print user properly for application add. + (Varun Saxena via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b543d1a3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.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/scheduler/capacity/LeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java index 8e39133..e5b44a6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java @@ -676,7 +676,8 @@ public class LeafQueue extends AbstractCSQueue { LOG.info("Application added -" + " appId: " + application.getApplicationId() + - " user: " + user + "," + " leaf-queue: " + getQueueName() + + " user: " + application.getUser() + "," + + " leaf-queue: " + getQueueName() + " #user-pending-applications: " + user.getPendingApplications() + " #user-active-applications: " + user.getActiveApplications() + " #queue-pending-applications: " + getNumPendingApplications() +