YARN-7807. Assume intra-app anti-affinity as default for scheduling request inside AppPlacementAllocator. (Wangda Tan via asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a9523d3e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a9523d3e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a9523d3e Branch: refs/heads/YARN-6592 Commit: a9523d3efd0d10c07c5a4c71492754e9c8bae424 Parents: 1c5a9f1 Author: Arun Suresh <[email protected]> Authored: Wed Jan 24 12:55:01 2018 -0800 Committer: Arun Suresh <[email protected]> Committed: Wed Jan 24 14:20:34 2018 -0800 ---------------------------------------------------------------------- .../placement/SingleConstraintAppPlacementAllocator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9523d3e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.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/placement/SingleConstraintAppPlacementAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.java index 9e7d71c..b02cb00 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/SingleConstraintAppPlacementAllocator.java @@ -334,14 +334,15 @@ public class SingleConstraintAppPlacementAllocator<N extends SchedulerNode> targetAllocationTags = new HashSet<>( targetExpression.getTargetValues()); - if (targetExpression.getTargetKey() == null || !targetExpression + if (targetExpression.getTargetKey() != null && !targetExpression .getTargetKey().equals(APPLICATION_LABEL_INTRA_APPLICATION)) { throwExceptionWithMetaInfo( "As of now, the only accepted target key for targetKey of " + "allocation_tag target expression is: [" + APPLICATION_LABEL_INTRA_APPLICATION + "]. Please make changes to placement constraints " - + "accordingly."); + + "accordingly. If this is null, it will be set to " + + APPLICATION_LABEL_INTRA_APPLICATION + " by default."); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
