hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject hadoop git commit: YARN-5754. Null check missing for earliest in FifoPolicy. (Yufei Gu via kasha)
Date Tue, 25 Oct 2016 05:23:49 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 5c2f67bda -> ab9105d81


YARN-5754. Null check missing for earliest in FifoPolicy. (Yufei Gu via kasha)

(cherry picked from commit a71fc81655cd5382d354674dd06570ba49753688)


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

Branch: refs/heads/branch-2
Commit: ab9105d81449dd466022e799fab6b27d6e9ff01e
Parents: 5c2f67b
Author: Karthik Kambatla <kasha@apache.org>
Authored: Mon Oct 24 22:19:14 2016 -0700
Committer: Karthik Kambatla <kasha@apache.org>
Committed: Mon Oct 24 22:19:56 2016 -0700

----------------------------------------------------------------------
 .../resourcemanager/scheduler/fair/policies/FifoPolicy.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab9105d8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/FifoPolicy.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/policies/FifoPolicy.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/policies/FifoPolicy.java
index d3fdcf6..3e2cb9f 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/policies/FifoPolicy.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/policies/FifoPolicy.java
@@ -96,7 +96,10 @@ public class FifoPolicy extends SchedulingPolicy {
         earliest = schedulable;
       }
     }
-    earliest.setFairShare(Resources.clone(totalResources));
+
+    if (earliest != null) {
+      earliest.setFairShare(Resources.clone(totalResources));
+    }
   }
 
   @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message