hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvasu...@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 Tue, 27 Oct 2015 15:29:29 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 3138b43f1 -> c5bf1cb7a
  refs/heads/trunk bcb2386e3 -> c28e16b40


YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt. Contributed by Bibin
A Chundatt.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c28e16b4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c28e16b4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c28e16b4

Branch: refs/heads/trunk
Commit: c28e16b40caf1e22f72cf2214ebc2fe2eaca4d03
Parents: bcb2386
Author: Varun Vasudev <vvasudev@apache.org>
Authored: Tue Oct 27 20:56:00 2015 +0530
Committer: Varun Vasudev <vvasudev@apache.org>
Committed: Tue Oct 27 20:56:00 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/c28e16b4/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 310b3b5..fce220b 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 @@ final 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/c28e16b4/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 29259c4..f5a3a83 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


Mime
View raw message