You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ro...@apache.org on 2016/01/05 07:41:31 UTC
hadoop git commit: YARN-4535. Fix checkstyle error in
CapacityScheduler.java (Naganarasimha G R via rohithsharmaks)
Repository: hadoop
Updated Branches:
refs/heads/trunk 778146eaa -> 6da6d8787
YARN-4535. Fix checkstyle error in CapacityScheduler.java (Naganarasimha G R via rohithsharmaks)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6da6d878
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6da6d878
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6da6d878
Branch: refs/heads/trunk
Commit: 6da6d87872de518bb2583f65c9595f2090c855d7
Parents: 778146e
Author: rohithsharmaks <ro...@apache.org>
Authored: Tue Jan 5 12:09:57 2016 +0530
Committer: rohithsharmaks <ro...@apache.org>
Committed: Tue Jan 5 12:09:57 2016 +0530
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../resourcemanager/scheduler/capacity/CapacityScheduler.java | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6da6d878/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index bd3a704..cc8acbc 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -102,6 +102,9 @@ Release 2.9.0 - UNRELEASED
YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit
(tangshangwen via rohithsharmaks)
+ YARN-4535. Fix checkstyle error in CapacityScheduler.java
+ (Naganarasimha G R via rohithsharmaks)
+
Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6da6d878/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
----------------------------------------------------------------------
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/CapacityScheduler.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/CapacityScheduler.java
index 159c7a5..c7b73fb 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/CapacityScheduler.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/CapacityScheduler.java
@@ -647,10 +647,10 @@ public class CapacityScheduler extends
parentQueue.setChildQueues(childQueues);
}
- if(queue instanceof LeafQueue == true && queues.containsKey(queueName)
- && queues.get(queueName) instanceof LeafQueue == true) {
+ if (queue instanceof LeafQueue && queues.containsKey(queueName)
+ && queues.get(queueName) instanceof LeafQueue) {
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);