hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wan...@apache.org
Subject [2/3] hadoop git commit: YARN-4510. Fix SLS startup failure caused by NPE. (Bibin A Chundatt via wangda)
Date Wed, 30 Dec 2015 23:42:07 GMT
YARN-4510. Fix SLS startup failure caused by NPE. (Bibin A Chundatt via wangda)


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

Branch: refs/heads/branch-2
Commit: 6eefae1b33928486e7a8572e14eaf00b83f2acfc
Parents: 9a7d5f6
Author: Wangda Tan <wangda@apache.org>
Authored: Wed Dec 30 15:34:39 2015 -0800
Committer: Wangda Tan <wangda@apache.org>
Committed: Wed Dec 30 15:34:39 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java  | 3 ++-
 .../hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java  | 8 ++++++++
 hadoop-yarn-project/CHANGES.txt                              | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6eefae1b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
index a082e20..2e9cccb 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
@@ -172,10 +172,11 @@ public class RMNodeWrapper implements RMNode {
     // TODO Auto-generated method stub
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public List<Container> pullNewlyIncreasedContainers() {
     // TODO Auto-generated method stub
-    return null;
+    return Collections.EMPTY_LIST;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6eefae1b/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 e9d829e..47ec2d1 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
@@ -820,6 +820,14 @@ public class ResourceSchedulerWrapper
     ((AbstractYarnScheduler<SchedulerApplicationAttempt, SchedulerNode>)
         scheduler).init(conf);
     super.serviceInit(conf);
+    initScheduler(conf);
+  }
+
+  private synchronized void initScheduler(Configuration configuration) throws
+  IOException {
+    this.applications =
+        new ConcurrentHashMap<ApplicationId,
+        SchedulerApplication<SchedulerApplicationAttempt>>();
   }
 
   @SuppressWarnings("unchecked")

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6eefae1b/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b26a5f1..c208c17 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1205,6 +1205,8 @@ Release 2.7.3 - UNRELEASED
 
     YARN-4315. NaN in Queue percentage for cluster apps page. (Bibin A Chundatt via wangda)
 
+    YARN-4510. Fix SLS startup failure caused by NPE. (Bibin A Chundatt via wangda)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES


Mime
View raw message