hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [18/50] [abbrv] hadoop git commit: YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable. (Kai Sasaki via kasha)
Date Mon, 22 Feb 2016 19:47:37 GMT
YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable. (Kai Sasaki via kasha)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ab4c476
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ab4c476
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ab4c476

Branch: refs/heads/HDFS-1312
Commit: 2ab4c476ed22d3ccf15b215710b67e32bbc7e5f0
Parents: 0fb14aa
Author: Karthik Kambatla <kasha@apache.org>
Authored: Wed Feb 17 17:44:35 2016 -0800
Committer: Karthik Kambatla <kasha@apache.org>
Committed: Wed Feb 17 18:16:15 2016 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../server/resourcemanager/scheduler/fair/FSParentQueue.java   | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ab4c476/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1547f10..f7c69a4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ab4c476/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;
         }
       }


Mime
View raw message