big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable. (Kai Sasaki via kasha)

Browse Source
This commit is contained in:
Karthik Kambatla 2016-02-17 17:44:35 -08:00
parent 0fb14aaced
commit 2ab4c476ed
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,9 @@ Trunk - Unreleased
YARN-3261. rewrite resourcemanager restart doc to remove roadmap bits (Gururaj Shetty via aw)
YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable.
(Kai Sasaki via kasha)
OPTIMIZATIONS
BUG FIXES

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSParentQueue.java
View File

@ -266,10 +266,8 @@ public RMContainer preemptContainer() {
LOG.debug("skipping from queue=" + getName()
+ " because it's a non-preemptable queue");
}
continue;
}
if (candidateQueue == null ||
comparator.compare(queue, candidateQueue) > 0) {
} else if (candidateQueue == null ||
comparator.compare(queue, candidateQueue) > 0) {
candidateQueue = queue;
}
}