YARN-6061. Addendum. Remove extraneous change.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/353a9b2d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/353a9b2d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/353a9b2d Branch: refs/heads/YARN-5734 Commit: 353a9b2d9165a221491395edbadf8acc3a39990b Parents: 8e53f2b Author: Karthik Kambatla <ka...@cloudera.com> Authored: Tue Feb 14 15:19:52 2017 -0800 Committer: Karthik Kambatla <ka...@cloudera.com> Committed: Tue Feb 14 15:19:52 2017 -0800 ---------------------------------------------------------------------- .../scheduler/fair/policies/DominantResourceFairnessPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/353a9b2d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/policies/DominantResourceFairnessPolicy.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/DominantResourceFairnessPolicy.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/DominantResourceFairnessPolicy.java index 7a29735..ad41b11 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/DominantResourceFairnessPolicy.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/DominantResourceFairnessPolicy.java @@ -90,7 +90,7 @@ public class DominantResourceFairnessPolicy extends SchedulingPolicy { @Override public boolean checkIfUsageOverFairShare(Resource usage, Resource fairShare) { - return Resources.greaterThan(CALCULATOR, null, usage, fairShare); + return !Resources.fitsIn(usage, fairShare); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org