hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [1/2] hadoop git commit: YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt. Contributed by Bibin A Chundatt.
Date Sun, 21 May 2017 18:42:47 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 eecc68d4d -> 94031b197


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/6feef1b0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6feef1b0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6feef1b0

Branch: refs/heads/branch-2.7
Commit: 6feef1b0395d8c7b22053144803fbd3c6e83d2ed
Parents: eecc68d
Author: Varun Vasudev <vvasudev@apache.org>
Authored: Tue Oct 27 20:56:00 2015 +0530
Committer: Konstantin V Shvachko <shv@apache.org>
Committed: Sun May 21 11:31:23 2017 -0700

----------------------------------------------------------------------
 .../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/6feef1b0/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 e729363..70525b4 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 class ResourceSchedulerWrapper
   @LimitedPrivate("yarn")
   @Unstable
   public Resource getClusterResource() {
-    return null;
+    return super.getClusterResource();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6feef1b0/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 25ce86e..352d1e7 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


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message