From 06f5d27bd6c86096011be3b8762e8507766824b2 Mon Sep 17 00:00:00 2001
From: Daniel Templeton <templedf@apache.org>
Date: Tue, 22 Nov 2016 11:16:00 -0800
Subject: [PATCH] YARN-5722. FairScheduler hides group resolution exceptions
 when assigning queue (Contributed by Wilfred Spiegelenburg via Daniel
 Templeton)

(cherry picked from commit 83cc7263af632939dc3b2ee58d8f03f98ed4d96a)
---
 .../server/resourcemanager/scheduler/fair/FairScheduler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 1d04710ceb1..354f93603a5 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
@@ -767,7 +767,8 @@ public class FairScheduler extends
     } catch (InvalidQueueNameException qne) {
       appRejectMsg = qne.getMessage();
     } catch (IOException ioe) {
-      appRejectMsg = "Error assigning app to queue " + queueName;
+      // IOException should only happen for a user without groups
+      appRejectMsg = "Error assigning app to a queue: " + ioe.getMessage();
     }
 
     if (appRejectMsg != null && rmApp != null) {