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 e7293630f39..70525b47a8a 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 @@ -926,7 +926,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 25ce86e24f5..352d1e7f141 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -85,6 +85,9 @@ Release 2.7.4 - UNRELEASED YARN-5543. ResourceManager SchedulingMonitor could potentially terminate the preemption checker thread. (Min Shen, Jonathan Hung via shv). + YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt + (Bibin A Chundatt via vvasudev) + Release 2.7.3 - 2016-08-25 INCOMPATIBLE CHANGES