From 6feef1b0395d8c7b22053144803fbd3c6e83d2ed Mon Sep 17 00:00:00 2001
From: Varun Vasudev <vvasudev@apache.org>
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.

(cherry picked from commit c28e16b40caf1e22f72cf2214ebc2fe2eaca4d03)
---
 .../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 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