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 wa...@apache.org on 2015/04/18 02:22:40 UTC
hadoop git commit: YARN-3487. CapacityScheduler scheduler lock
obtained unnecessarily when calling getQueue (Jason Lowe via wangda)
Repository: hadoop
Updated Branches:
refs/heads/trunk f65eeb412 -> f47a5763a
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/f47a5763
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f47a5763
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f47a5763
Branch: refs/heads/trunk
Commit: f47a5763acd55cb0b3f16152c7f8df06ec0e09a9
Parents: f65eeb4
Author: Wangda Tan <wa...@apache.org>
Authored: Fri Apr 17 17:22:27 2015 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Fri Apr 17 17:22:27 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/f47a5763/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 710ee15..dfedc8a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -238,6 +238,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/f47a5763/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);
}