Repository: hadoop Updated Branches: refs/heads/branch-2 6b8e353c6 -> eb1751670
YARN-6779. DominantResourceFairnessPolicy.DominantResourceFairnessComparator.calculateShares() should be @VisibleForTesting (Contributed by Yeliang Cang via Daniel Templeton) (cherry picked from commit bb30bd3771442df253cbe55c448379580bd5ad07) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb175167 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb175167 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb175167 Branch: refs/heads/branch-2 Commit: eb1751670abb2a49b67c5ac51ff696df59d33434 Parents: 6b8e353 Author: Daniel Templeton <[email protected]> Authored: Mon Jul 24 12:13:50 2017 -0700 Committer: Daniel Templeton <[email protected]> Committed: Mon Jul 24 12:15:35 2017 -0700 ---------------------------------------------------------------------- .../scheduler/fair/policies/DominantResourceFairnessPolicy.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb175167/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 193ed4d..72377b0 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 @@ -21,6 +21,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies; import java.util.Collection; import java.util.Comparator; +import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.records.Resource; @@ -174,6 +175,7 @@ public class DominantResourceFairnessPolicy extends SchedulingPolicy { * by largest share. So if resource=<10 MB, 5 CPU>, and pool=<100 MB, 10 CPU>, * shares will be [.1, .5] and resourceOrder will be [CPU, MEMORY]. */ + @VisibleForTesting void calculateShares(Resource resource, Resource pool, ResourceWeights shares, ResourceType[] resourceOrder, ResourceWeights weights) { shares.setWeight(MEMORY, (float)resource.getMemorySize() / --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
