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

YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when calling getQueue (Jason Lowe via wangda) 

(cherry picked from commit f47a5763ac)
This commit is contained in:
Wangda Tan 2015-04-17 17:22:27 -07:00
parent e7cbecddc3
commit 3316cd4357
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,6 +190,8 @@ Release 2.7.1 - UNRELEASED
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES 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 YARN-3462. Patches applied for YARN-2424 are inconsistent between
trunk and branch-2. (Naganarasimha G R via harsh) trunk and branch-2. (Naganarasimha G R via harsh)

8
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

@ -642,7 +642,7 @@ public class CapacityScheduler extends
return queue; return queue;
} }
public synchronized CSQueue getQueue(String queueName) { public CSQueue getQueue(String queueName) {
if (queueName == null) { if (queueName == null) {
return null; return null;
} }
@ -940,11 +940,7 @@ public class CapacityScheduler extends
boolean includeChildQueues, boolean recursive) boolean includeChildQueues, boolean recursive)
throws IOException { throws IOException {
CSQueue queue = null; CSQueue queue = null;
queue = this.queues.get(queueName);
synchronized (this) {
queue = this.queues.get(queueName);
}
if (queue == null) { if (queue == null) {
throw new IOException("Unknown queue: " + queueName); throw new IOException("Unknown queue: " + queueName);
} }