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

YARN-6560. SLS doesn't honor node total resource specified in sls-runner.xml. Contributed by Wangda Tan.

This commit is contained in:
Sunil G 2017-05-18 22:49:42 +05:30
parent ba70225cf6
commit 40e6a85d25
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
View File

@ -145,6 +145,16 @@ public class SLSRunner extends Configured implements Tool {
init(tempConf); init(tempConf);
} }
@Override
public void setConf(Configuration conf) {
if (null != conf) {
// Override setConf to make sure all conf added load sls-runner.xml, see
// YARN-6560
conf.addResource("sls-runner.xml");
}
super.setConf(conf);
}
private void init(Configuration tempConf) throws ClassNotFoundException { private void init(Configuration tempConf) throws ClassNotFoundException {
nmMap = new HashMap<>(); nmMap = new HashMap<>();
queueAppNumMap = new HashMap<>(); queueAppNumMap = new HashMap<>();
@ -152,8 +162,7 @@ public class SLSRunner extends Configured implements Tool {
amClassMap = new HashMap<>(); amClassMap = new HashMap<>();
// runner configuration // runner configuration
tempConf.addResource("sls-runner.xml"); setConf(tempConf);
super.setConf(tempConf);
// runner // runner
int poolSize = tempConf.getInt(SLSConfiguration.RUNNER_POOL_SIZE, int poolSize = tempConf.getInt(SLSConfiguration.RUNNER_POOL_SIZE,