Repository: hadoop Updated Branches: refs/heads/branch-2.7 7569289e9 -> d6105d944
YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when calling getQueue (Jason Lowe via wangda) (cherry picked from commit f47a5763acd55cb0b3f16152c7f8df06ec0e09a9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d6105d94 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d6105d94 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d6105d94 Branch: refs/heads/branch-2.7 Commit: d6105d944cb23f6e56b4a7c7a61c6d3b334dd536 Parents: 7569289 Author: Wangda Tan <wan...@apache.org> Authored: Fri Apr 17 17:22:27 2015 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Fri Apr 17 17:23:34 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/d6105d94/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9072edf..1b74021 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -11,6 +11,8 @@ Release 2.7.1 - UNRELEASED OPTIMIZATIONS BUG FIXES + YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when + calling getQueue (Jason Lowe via wangda) YARN-3462. Patches applied for YARN-2424 are inconsistent between trunk and branch-2. (Naganarasimha G R via harsh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6105d94/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 28ce264..112a4c3 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 @@ -627,7 +627,7 @@ public class CapacityScheduler extends return queue; } - public synchronized CSQueue getQueue(String queueName) { + public CSQueue getQueue(String queueName) { if (queueName == null) { return null; } @@ -925,11 +925,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); }
