Repository: hadoop Updated Branches: refs/heads/trunk ba70225cf -> 40e6a85d2
YARN-6560. SLS doesn't honor node total resource specified in sls-runner.xml. Contributed by Wangda Tan. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/40e6a85d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/40e6a85d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/40e6a85d Branch: refs/heads/trunk Commit: 40e6a85d25387d4025585c5726b3e4e24c2c1572 Parents: ba70225 Author: Sunil G <sun...@apache.org> Authored: Thu May 18 22:49:42 2017 +0530 Committer: Sunil G <sun...@apache.org> Committed: Thu May 18 22:49:42 2017 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/yarn/sls/SLSRunner.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/40e6a85d/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java ---------------------------------------------------------------------- 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 f66d2d0..e679c9d 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 @@ -145,6 +145,16 @@ public class SLSRunner extends Configured implements Tool { 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<>(); @@ -152,8 +162,7 @@ public class SLSRunner extends Configured implements Tool { amClassMap = new HashMap<>(); // runner configuration - tempConf.addResource("sls-runner.xml"); - super.setConf(tempConf); + setConf(tempConf); // runner int poolSize = tempConf.getInt(SLSConfiguration.RUNNER_POOL_SIZE, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org