Repository: hadoop Updated Branches: refs/heads/YARN-2928 4459349c8 -> ce6aa1b1c
YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when calling getQueue (Jason Lowe via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b8dfc8ab Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b8dfc8ab Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b8dfc8ab Branch: refs/heads/YARN-2928 Commit: b8dfc8abd0660114b18bcb1f2a277cf2c7afb261 Parents: 86762f0 Author: Wangda Tan <[email protected]> Authored: Fri Apr 17 17:22:27 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Tue Apr 21 16:16:52 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../scheduler/capacity/CapacityScheduler.java | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8dfc8ab/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7b2158c..e7622f8 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -297,6 +297,8 @@ Release 2.7.1 - UNRELEASED OPTIMIZATIONS BUG FIXES + YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when + calling getQueue (Jason Lowe via wangda) Release 2.7.0 - UNRELEASED http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8dfc8ab/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 5d58b15..1e1623d 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 @@ -642,7 +642,7 @@ public class CapacityScheduler extends return queue; } - public synchronized CSQueue getQueue(String queueName) { + public CSQueue getQueue(String queueName) { if (queueName == null) { return null; } @@ -940,11 +940,7 @@ public class CapacityScheduler extends boolean includeChildQueues, boolean recursive) throws IOException { CSQueue queue = null; - - synchronized (this) { - queue = this.queues.get(queueName); - } - + queue = this.queues.get(queueName); if (queue == null) { throw new IOException("Unknown queue: " + queueName); }
