Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4510. Fix SLS startup failure caused by NPE. (Bibin A Chundatt via wangda) 

(cherry picked from commit 6eefae1b33)
This commit is contained in:
Wangda Tan 2015-12-30 15:34:39 -08:00
parent c16e126d16
commit 8c3ad2b734
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
View File

@ -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

8
hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
View File

@ -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")

2
hadoop-yarn-project/CHANGES.txt
View File

@ -1159,6 +1159,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