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/10/26 18:30:48 UTC
[22/50] [abbrv] hadoop git commit: YARN-5754. Null check missing for
earliest in FifoPolicy. (Yufei Gu via kasha)
YARN-5754. Null check missing for earliest in FifoPolicy. (Yufei Gu via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a71fc816
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a71fc816
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a71fc816
Branch: refs/heads/YARN-4752
Commit: a71fc81655cd5382d354674dd06570ba49753688
Parents: 3372e94
Author: Karthik Kambatla <ka...@apache.org>
Authored: Mon Oct 24 22:19:14 2016 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Mon Oct 24 22:19:23 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/a71fc816/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