From c28e16b40caf1e22f72cf2214ebc2fe2eaca4d03 Mon Sep 17 00:00:00 2001 From: Varun Vasudev Date: Tue, 27 Oct 2015 20:56:00 +0530 Subject: [PATCH] YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt. Contributed by Bibin A Chundatt. --- .../hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java | 2 +- hadoop-yarn-project/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 310b3b50bb2..fce220bf79e 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 @@ -932,7 +932,7 @@ public String moveApplication(ApplicationId appId, String newQueue) @LimitedPrivate("yarn") @Unstable public Resource getClusterResource() { - return null; + return super.getClusterResource(); } @Override diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 29259c4cd55..f5a3a834a0c 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1025,6 +1025,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