YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt. Contributed by Bibin A Chundatt.
(cherry picked from commit c28e16b40caf1e22f72cf2214ebc2fe2eaca4d03) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c5bf1cb7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c5bf1cb7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c5bf1cb7 Branch: refs/heads/branch-2 Commit: c5bf1cb7af33d93cff783b00d945eb3be66c3c5e Parents: 3138b43 Author: Varun Vasudev <vvasu...@apache.org> Authored: Tue Oct 27 20:56:00 2015 +0530 Committer: Varun Vasudev <vvasu...@apache.org> Committed: Tue Oct 27 20:56:45 2015 +0530 ---------------------------------------------------------------------- .../hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java | 2 +- hadoop-yarn-project/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5bf1cb7/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java index d94a31d..e9d829e 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java @@ -933,7 +933,7 @@ public class ResourceSchedulerWrapper @LimitedPrivate("yarn") @Unstable public Resource getClusterResource() { - return null; + return super.getClusterResource(); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5bf1cb7/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 2d2770a..fe804a2 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -973,6 +973,9 @@ Release 2.8.0 - UNRELEASED YARN-3573. MiniMRYarnCluster constructor that starts the timeline server using a boolean should be marked deprecated. (Brahma Reddy Battula via ozawa) + YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt + (Bibin A Chundatt via vvasudev) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES
