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 ka...@apache.org on 2016/02/18 03:34:20 UTC
hadoop git commit: YARN-4689. FairScheduler: Cleanup preemptContainer
to be more readable. (Kai Sasaki via kasha) (cherry picked from commit
2ab4c476ed22d3ccf15b215710b67e32bbc7e5f0)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ad4fcd1f9 -> 33c198859
YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable. (Kai Sasaki via kasha)
(cherry picked from commit 2ab4c476ed22d3ccf15b215710b67e32bbc7e5f0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33c19885
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33c19885
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33c19885
Branch: refs/heads/branch-2
Commit: 33c1988595757128a54f5512b621e4fe645a25eb
Parents: ad4fcd1
Author: Karthik Kambatla <ka...@apache.org>
Authored: Wed Feb 17 17:44:35 2016 -0800
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Wed Feb 17 18:28:08 2016 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 4 ++++
.../server/resourcemanager/scheduler/fair/FSParentQueue.java | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33c19885/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index aaf4b56..1f36d62 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -73,6 +73,10 @@ Release 2.9.0 - UNRELEASED
YARN-4655. Log uncaught exceptions/errors in various thread pools in YARN.
(Sidharta Seethana via vvasudev)
+ YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable.
+ (Kai Sasaki via kasha)
+
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33c19885/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
----------------------------------------------------------------------
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/fair/FSParentQueue.java b/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
index a028422..d9fac90 100644
--- a/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
+++ b/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
@@ -266,10 +266,8 @@ public class FSParentQueue extends FSQueue {
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;
}
}