Repository: hadoop Updated Branches: refs/heads/branch-2 4e6fc3ca1 -> 5c2f495fc
YARN-4603. FairScheduler should mention user requested queuename in error message when failed in queue ACL check. (Tao Jie via kasha) (cherry picked from commit 4992398aeeb213ce59e068b0226e22e49ce559eb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5c2f495f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5c2f495f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5c2f495f Branch: refs/heads/branch-2 Commit: 5c2f495fcc16975811ad45a141358bcacc103d3f Parents: 4e6fc3c Author: Karthik Kambatla <ka...@cloudera.com> Authored: Thu Jan 21 17:40:59 2016 +0100 Committer: Karthik Kambatla <ka...@cloudera.com> Committed: Thu Jan 21 17:43:49 2016 +0100 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/scheduler/fair/FairScheduler.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5c2f495f/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 13d519c..2234aad 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -43,6 +43,9 @@ Release 2.9.0 - UNRELEASED YARN-4559. Make leader elector and zk store share the same curator client. (Jian He via xgong) + YARN-4603. FairScheduler should mention user requested queuename in error + message when failed in queue ACL check. (Tao Jie via kasha) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5c2f495f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.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/fair/FairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java index a36dd8c..7e013e0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java @@ -656,7 +656,8 @@ public class FairScheduler extends if (!queue.hasAccess(QueueACL.SUBMIT_APPLICATIONS, userUgi) && !queue.hasAccess(QueueACL.ADMINISTER_QUEUE, userUgi)) { String msg = "User " + userUgi.getUserName() + - " cannot submit applications to queue " + queue.getName(); + " cannot submit applications to queue " + queue.getName() + + "(requested queuename is " + queueName + ")"; LOG.info(msg); rmContext.getDispatcher().getEventHandler() .handle(new RMAppEvent(applicationId,