Repository: hadoop Updated Branches: refs/heads/YARN-1011 f6e03a59b -> 843c993b7
YARN-7077. TestAMSimulator and TestNMSimulator fail. (Contributed by Akira Ajisaka via Yufei Gu) (cherry picked from commit 26fafc359787eae0ef82196000f4a04956b2abaa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/843c993b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/843c993b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/843c993b Branch: refs/heads/YARN-1011 Commit: 843c993b71bd8ecfa57ca6451a73de2f7efd1ec1 Parents: f6e03a5 Author: Yufei Gu <[email protected]> Authored: Tue Aug 29 16:33:29 2017 -0700 Committer: Haibo Chen <[email protected]> Committed: Fri Sep 8 14:37:58 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/yarn/sls/SLSRunner.java | 4 ++++ hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/843c993b/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 477cc4a..59f9c17 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 @@ -66,6 +66,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.ApplicationMasterLauncher; +import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; @@ -227,6 +228,9 @@ public class SLSRunner extends Configured implements Tool { if (Class.forName(schedulerClass) == CapacityScheduler.class) { rmConf.set(YarnConfiguration.RM_SCHEDULER, SLSCapacityScheduler.class.getName()); + rmConf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); + rmConf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + ProportionalCapacityPreemptionPolicy.class.getName()); } else if (Class.forName(schedulerClass) == FairScheduler.class) { rmConf.set(YarnConfiguration.RM_SCHEDULER, SLSFairScheduler.class.getName()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/843c993b/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml b/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml index 7b2e674..20146fc 100644 --- a/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml +++ b/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml @@ -22,16 +22,6 @@ </property> <property> - <name>yarn.resourcemanager.scheduler.monitor.enable</name> - <value>true</value> - </property> - - <property> - <name>yarn.resourcemanager.scheduler.monitor.policies</name> - <value>org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy</value> - </property> - - <property> <description>The address of the RM web application.</description> <name>yarn.resourcemanager.webapp.address</name> <value>localhost:18088</value> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
