diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index f9ee097..41b119e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -501,6 +501,36 @@ protected void serviceStop() throws Exception { super.serviceStop(); } + + protected void createPolicyMonitors() { + if (scheduler instanceof PreemptableResourceScheduler + && conf.getBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, + YarnConfiguration.DEFAULT_RM_SCHEDULER_ENABLE_MONITORS)) { + LOG.info("Loading policy monitors"); + List policies = conf.getInstances( + YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + SchedulingEditPolicy.class); + if (policies.size() > 0) { + rmDispatcher.register(ContainerPreemptEventType.class, + new RMContainerPreemptEventDispatcher( + (PreemptableResourceScheduler) scheduler)); + for (SchedulingEditPolicy policy : policies) { + LOG.info("LOADING SchedulingEditPolicy:" + policy.getPolicyName()); + policy.init(conf, rmContext.getDispatcher().getEventHandler(), + (PreemptableResourceScheduler) scheduler); + // periodically check whether we need to take action to guarantee + // constraints + SchedulingMonitor mon = new SchedulingMonitor(policy); + addService(mon); + } + } else { + LOG.warn("Policy monitors configured (" + + YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS + + ") but none specified (" + + YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES + ")"); + } + } + } } @Private @@ -829,37 +859,6 @@ protected ApplicationMasterService createApplicationMasterService() { return new ApplicationMasterService(this.rmContext, scheduler); } - protected void createPolicyMonitors() { - if (scheduler instanceof PreemptableResourceScheduler - && conf.getBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, - YarnConfiguration.DEFAULT_RM_SCHEDULER_ENABLE_MONITORS)) { - LOG.info("Loading policy monitors"); - List policies = conf.getInstances( - YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, - SchedulingEditPolicy.class); - if (policies.size() > 0) { - this.rmDispatcher.register(ContainerPreemptEventType.class, - new RMContainerPreemptEventDispatcher( - (PreemptableResourceScheduler) scheduler)); - for (SchedulingEditPolicy policy : policies) { - LOG.info("LOADING SchedulingEditPolicy:" + policy.getPolicyName()); - policy.init(conf, this.rmContext.getDispatcher().getEventHandler(), - (PreemptableResourceScheduler) scheduler); - // periodically check whether we need to take action to guarantee - // constraints - SchedulingMonitor mon = new SchedulingMonitor(policy); - addService(mon); - - } - } else { - LOG.warn("Policy monitors configured (" + - YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS + - ") but none specified (" + - YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES + ")"); - } - } - } - protected AdminService createAdminService( ClientRMService clientRMService, ApplicationMasterService applicationMasterService, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java new file mode 100644 index 0000000..4c9e5af --- /dev/null +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/TestSchedulingMonitor.java @@ -0,0 +1,29 @@ +package org.apache.hadoop.yarn.server.resourcemanager.monitor; + + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy; +import org.junit.Test; + +import static org.junit.Assert.fail; + +public class TestSchedulingMonitor { + + @Test(timeout = 10000) + public void testRMStarts() { + Configuration conf = new YarnConfiguration(); + conf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); + conf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + ProportionalCapacityPreemptionPolicy.class.getCanonicalName()); + + ResourceManager rm = new ResourceManager(); + try { + rm.init(conf); + } catch (Exception e) { + fail("ResourceManager does not start when " + + YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS + " is set to true"); + } + } +}