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 as...@apache.org on 2018/01/25 05:19:36 UTC

[30/31] hadoop git commit: YARN-7807. Assume intra-app anti-affinity as default for scheduling request inside AppPlacementAllocator. (Wangda Tan via asuresh)

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/de10ad7d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de10ad7d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de10ad7d

Branch: refs/heads/YARN-6592
Commit: de10ad7d8ecba9db911e0c5c056361063a057a22
Parents: c8f73cd
Author: Arun Suresh <as...@apache.org>
Authored: Wed Jan 24 12:55:01 2018 -0800
Committer: Arun Suresh <as...@apache.org>
Committed: Wed Jan 24 21:17:06 2018 -0800

----------------------------------------------------------------------
 .../placement/SingleConstraintAppPlacementAllocator.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/de10ad7d/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org