You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2016/01/03 00:08:18 UTC
[4/5] hadoop git commit: YARN-4510. Fix SLS startup failure caused by
NPE. (Bibin A Chundatt via wangda)
YARN-4510. Fix SLS startup failure caused by NPE. (Bibin A Chundatt via wangda)
(cherry picked from commit 6eefae1b33928486e7a8572e14eaf00b83f2acfc)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a9594c61
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a9594c61
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a9594c61
Branch: refs/heads/yarn-2877
Commit: a9594c61bb8ca9e61e367988d3012a4615026090
Parents: 8310b2e
Author: Wangda Tan <wa...@apache.org>
Authored: Wed Dec 30 15:34:39 2015 -0800
Committer: Wangda Tan <wa...@apache.org>
Committed: Wed Dec 30 15:39:27 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/a9594c61/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/a9594c61/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 fce220b..106525d 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
@@ -819,6 +819,14 @@ final 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/a9594c61/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4c8eecb..b551aae 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1260,6 +1260,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