diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java index ddd35ef4754..011b2ee396f 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java @@ -141,6 +141,16 @@ public SLSRunner(Configuration tempConf) throws ClassNotFoundException { 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 { nmMap = new HashMap<>(); queueAppNumMap = new HashMap<>(); @@ -148,8 +158,7 @@ private void init(Configuration tempConf) throws ClassNotFoundException { amClassMap = new HashMap<>(); // runner configuration - tempConf.addResource("sls-runner.xml"); - super.setConf(tempConf); + setConf(tempConf); // runner int poolSize = tempConf.getInt(SLSConfiguration.RUNNER_POOL_SIZE,