Index: 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 =================================================================== --- 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 (revision 1553399) +++ 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 (working copy) @@ -653,24 +653,24 @@ @VisibleForTesting FSLeafQueue assignToQueue(RMApp rmApp, String queueName, String user) { - FSLeafQueue queue = null; try { QueuePlacementPolicy placementPolicy = allocConf.getPlacementPolicy(); queueName = placementPolicy.assignAppToQueue(queueName, user); if (queueName == null) { return null; } - queue = queueMgr.getLeafQueue(queueName, true); } catch (IOException ex) { LOG.error("Error assigning app to queue, rejecting", ex); + return null; } - + + FSLeafQueue queue = queueMgr.getLeafQueue(queueName, true); if (rmApp != null) { rmApp.setQueue(queue.getName()); } else { LOG.warn("Couldn't find RM app to set queue name on"); } - + return queue; }