Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4535. Fix checkstyle error in CapacityScheduler.java (Naganarasimha G R via rohithsharmaks) 

(cherry picked from commit 6da6d87872)
This commit is contained in:
rohithsharmaks 2016-01-05 12:09:57 +05:30
parent cdd796d199
commit 0492552f30
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -44,6 +44,9 @@ Release 2.9.0 - UNRELEASED
YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit
(tangshangwen via rohithsharmaks) (tangshangwen via rohithsharmaks)
YARN-4535. Fix checkstyle error in CapacityScheduler.java
(Naganarasimha G R via rohithsharmaks)
Release 2.8.0 - UNRELEASED Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
View File

@ -647,10 +647,10 @@ static CSQueue parseQueue(
parentQueue.setChildQueues(childQueues); parentQueue.setChildQueues(childQueues);
} }
if(queue instanceof LeafQueue == true && queues.containsKey(queueName) if (queue instanceof LeafQueue && queues.containsKey(queueName)
&& queues.get(queueName) instanceof LeafQueue == true) { && queues.get(queueName) instanceof LeafQueue) {
throw new IOException("Two leaf queues were named " + queueName throw new IOException("Two leaf queues were named " + queueName
+ ". Leaf queue names must be distinct"); + ". Leaf queue names must be distinct");
} }
queues.put(queueName, queue); queues.put(queueName, queue);