Repository: hadoop Updated Branches: refs/heads/branch-2 651aa8761 -> 19a8e4823
YARN-3270. Fix node label expression not getting set in ApplicationSubmissionContext (Rohit Agarwal via wangda) (cherry picked from commit abac6eb9d530bb1e6ff58ec3c75b17d840a0ee3f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19a8e482 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/19a8e482 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/19a8e482 Branch: refs/heads/branch-2 Commit: 19a8e48230435331191611f6f96671b5158f7be5 Parents: 651aa87 Author: Wangda Tan <[email protected]> Authored: Mon Mar 2 17:21:19 2015 -0800 Committer: Wangda Tan <[email protected]> Committed: Mon Mar 2 17:24:55 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/api/records/ApplicationSubmissionContext.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/19a8e482/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 801d960..fe280c4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -638,6 +638,9 @@ Release 2.7.0 - UNRELEASED all Schedulers even when using ParameterizedSchedulerTestBase. (Anubhav Dhoot via devaraj) + YARN-3270. Fix node label expression not getting set in + ApplicationSubmissionContext (Rohit Agarwal via wangda) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/19a8e482/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java index f1ebbfe..c4014fc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java @@ -155,6 +155,7 @@ public abstract class ApplicationSubmissionContext { context.setMaxAppAttempts(maxAppAttempts); context.setApplicationType(applicationType); context.setKeepContainersAcrossApplicationAttempts(keepContainers); + context.setNodeLabelExpression(appLabelExpression); context.setAMContainerResourceRequest(resourceRequest); return context; }
