Преглед на файлове

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

Sunil G преди 8 години
родител
ревизия
40e6a85d25
променени са 1 файла, в които са добавени 11 реда и са изтрити 2 реда
  1. 11 2
      hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java

+ 11 - 2
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,