diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigArgumentHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigArgumentHandler.java index 084b67d394e..41629c23e3b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigArgumentHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigArgumentHandler.java @@ -118,6 +118,15 @@ public FSConfigToCSConfigArgumentHandler() { "pc", "percentage", "Converts FS queue weights to percentages", false), + DISABLE_PREEMPTION("disable preemption", "dp", "disable-preemption", + "Disable the preemption with nopolicy or observeonly mode, " + + "default mode is nopolicy with no arg." + + "When use nopolicy arg, it means to remove " + + "ProportionalCapacityPreemptionPolicy for CS preemption, " + + "When use observeonly arg, " + + "it means to set " + + "yarn.resourcemanager.monitor.capacity.preemption.observe_only " + + "to true", true), HELP("help", "h", "help", "Displays the list of options", false); private final String name; @@ -251,6 +260,9 @@ private FSConfigToCSConfigConverterParams validateInputFiles( cliParser.getOptionValue(CliOption.CONVERSION_RULES.shortSwitch); String outputDir = cliParser.getOptionValue(CliOption.OUTPUT_DIR.shortSwitch); + String disablePreemptionMode = + cliParser.getOptionValue(CliOption.DISABLE_PREEMPTION.shortSwitch); + boolean convertPlacementRules = !cliParser.hasOption( CliOption.SKIP_PLACEMENT_RULES_CONVERSION.shortSwitch); @@ -260,6 +272,7 @@ private FSConfigToCSConfigConverterParams validateInputFiles( checkFile(CliOption.CONVERSION_RULES, conversionRulesFile); checkDirectory(CliOption.OUTPUT_DIR, outputDir); checkOutputDirDoesNotContainXmls(yarnSiteXmlFile, outputDir); + checkDisablePreemption(CliOption.DISABLE_PREEMPTION, disablePreemptionMode); // check mapping-rules.json if we intend to generate it if (!cliParser.hasOption(CliOption.CONSOLE_MODE.shortSwitch) && @@ -281,6 +294,9 @@ private FSConfigToCSConfigConverterParams validateInputFiles( cliParser.hasOption(CliOption.RULES_TO_FILE.shortSwitch)) .withUsePercentages( cliParser.hasOption(CliOption.CONVERT_PERCENTAGES.shortSwitch)) + .withDisablePreemption( + cliParser.hasOption(CliOption.DISABLE_PREEMPTION.shortSwitch), + disablePreemptionMode) .build(); } @@ -383,6 +399,22 @@ private static void checkFileInternal(CliOption cliOption, String filePath, } } + private static void checkDisablePreemption(CliOption cliOption, + String disablePreemptionMode) { + if (disablePreemptionMode == null || + disablePreemptionMode.trim().isEmpty()) { + // The default mode is nopolicy. + return; + } + + if (!disablePreemptionMode.equals("nopolicy") && + !disablePreemptionMode.equals("observeonly")) { + throw new PreconditionException( + String.format("Specified disable-preemption mode %s is not correct " + + " mode to %s)", disablePreemptionMode, cliOption.name)); + } + } + private FSConfigToCSConfigConverter getConverter() { return new FSConfigToCSConfigConverter(ruleHandler, conversionOptions); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverter.java index a7602343db2..36d833a0450 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverter.java @@ -103,6 +103,8 @@ private String outputDirectory; private boolean rulesToFile; private boolean usePercentages; + private boolean disablePreemption; + private String disablePreemptionMode; public FSConfigToCSConfigConverter(FSConfigToCSConfigRuleHandler ruleHandler, ConversionOptions conversionOptions) { @@ -121,6 +123,8 @@ public void convert(FSConfigToCSConfigConverterParams params) this.outputDirectory = params.getOutputDirectory(); this.rulesToFile = params.isPlacementRulesToFile(); this.usePercentages = params.isUsePercentages(); + this.disablePreemption = params.isDisablePreemption(); + this.disablePreemptionMode = params.getDisablePreemptionMode(); prepareOutputFiles(params.isConsole()); loadConversionRules(params.getConversionRulesConfig()); Configuration inputYarnSiteConfig = getInputYarnSiteConfig(params); @@ -277,7 +281,8 @@ private void convertYarnSiteXml(Configuration inputYarnSiteConfig) { new FSYarnSiteConverter(); siteConverter.convertSiteProperties(inputYarnSiteConfig, convertedYarnSiteConfig, drfUsed, - conversionOptions.isEnableAsyncScheduler()); + conversionOptions.isEnableAsyncScheduler(), + usePercentages, disablePreemption, disablePreemptionMode); preemptionEnabled = siteConverter.isPreemptionEnabled(); sizeBasedWeight = siteConverter.isSizeBasedWeight(); @@ -291,6 +296,7 @@ private void convertCapacitySchedulerXml(FairScheduler fs) { emitDefaultUserMaxParallelApplications(); emitUserMaxParallelApplications(); emitDefaultMaxAMShare(); + emitDisablePreemptionForObserveOnlyMode(); FSQueueConverter queueConverter = FSQueueConverterBuilder.create() .withRuleHandler(ruleHandler) @@ -303,6 +309,7 @@ private void convertCapacitySchedulerXml(FairScheduler fs) { .withConversionOptions(conversionOptions) .withDrfUsed(drfUsed) .withPercentages(usePercentages) + .withDisablePreemption(disablePreemption, disablePreemptionMode) .build(); queueConverter.convertQueueHierarchy(rootQueue); @@ -407,6 +414,14 @@ private void emitDefaultMaxAMShare() { queueMaxAMShareDefault); } } + private void emitDisablePreemptionForObserveOnlyMode() { + if (disablePreemption && + disablePreemptionMode.equals("observeonly")) { + capacitySchedulerConfig. + setBoolean(CapacitySchedulerConfiguration. + PREEMPTION_OBSERVE_ONLY, true); + } + } private void emitACLs(FairScheduler fs) { fs.getAllocationConfiguration().getQueueAcls() diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverterParams.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverterParams.java index 1f515302788..ba76e4bb085 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverterParams.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSConfigToCSConfigConverterParams.java @@ -30,6 +30,8 @@ private boolean convertPlacementRules; private boolean placementRulesToFile; private boolean usePercentages; + private boolean disablePreemption; + private String disablePreemptionMode; private FSConfigToCSConfigConverterParams() { //must use builder @@ -71,6 +73,14 @@ public boolean isUsePercentages() { return usePercentages; } + public boolean isDisablePreemption() { + return disablePreemption; + } + + public String getDisablePreemptionMode() { + return disablePreemptionMode; + } + @Override public String toString() { return "FSConfigToCSConfigConverterParams{" + @@ -99,6 +109,8 @@ public String toString() { private boolean convertPlacementRules; private boolean placementRulesToFile; private boolean usePercentages; + private boolean disablePreemption; + private String disablePreemptionMode; private Builder() { } @@ -152,6 +164,13 @@ public Builder withUsePercentages(boolean usePercentages) { return this; } + public Builder withDisablePreemption(boolean disablePreemption, + String disablePreemptionMode) { + this.disablePreemption = disablePreemption; + this.disablePreemptionMode = disablePreemptionMode; + return this; + } + public FSConfigToCSConfigConverterParams build() { FSConfigToCSConfigConverterParams params = new FSConfigToCSConfigConverterParams(); @@ -164,6 +183,8 @@ public FSConfigToCSConfigConverterParams build() { params.convertPlacementRules = this.convertPlacementRules; params.placementRulesToFile = this.placementRulesToFile; params.usePercentages = this.usePercentages; + params.disablePreemption = this.disablePreemption; + params.disablePreemptionMode = this.disablePreemptionMode; return params; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverterBuilder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverterBuilder.java index c01461747c7..5abc96c3c94 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverterBuilder.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSQueueConverterBuilder.java @@ -33,6 +33,8 @@ ConversionOptions conversionOptions; boolean drfUsed; boolean usePercentages; + boolean disablePreemption; + String disablePreemptionMode; private FSQueueConverterBuilder() { } @@ -99,6 +101,13 @@ public FSQueueConverterBuilder withPercentages(boolean usePercentages) { return this; } + public FSQueueConverterBuilder withDisablePreemption(boolean disablePreemption, + String disablePreemptionMode) { + this.disablePreemption = disablePreemption; + this.disablePreemptionMode = disablePreemptionMode; + return this; + } + public FSQueueConverter build() { return new FSQueueConverter(this); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSYarnSiteConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSYarnSiteConverter.java index 4222e3af6c2..1d99a540885 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSYarnSiteConverter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/FSYarnSiteConverter.java @@ -20,6 +20,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AutoCreatedQueueDeletionPolicy; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration; @@ -36,7 +38,9 @@ @SuppressWarnings({"deprecation", "checkstyle:linelength"}) public void convertSiteProperties(Configuration conf, - Configuration yarnSiteConfig, boolean drfUsed, boolean enableAsyncScheduler) { + Configuration yarnSiteConfig, boolean drfUsed, + boolean enableAsyncScheduler, boolean userPercentage, + boolean disablePreemption, String disablePreemptionMode) { yarnSiteConfig.set(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class.getCanonicalName()); @@ -52,12 +56,20 @@ public void convertSiteProperties(Configuration conf, "schedule-asynchronously.scheduling-interval-ms", interval); } + // This should be always true to trigger cs auto + // refresh queue. + yarnSiteConfig.setBoolean( + YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); + if (conf.getBoolean(FairSchedulerConfiguration.PREEMPTION, FairSchedulerConfiguration.DEFAULT_PREEMPTION)) { - yarnSiteConfig.setBoolean( - YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); preemptionEnabled = true; + String policies = addMonitorPolicy(ProportionalCapacityPreemptionPolicy. + class.getCanonicalName(), yarnSiteConfig); + yarnSiteConfig.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + policies); + int waitTimeBeforeKill = conf.getInt( FairSchedulerConfiguration.WAIT_TIME_BEFORE_KILL, FairSchedulerConfiguration.DEFAULT_WAIT_TIME_BEFORE_KILL); @@ -71,6 +83,24 @@ public void convertSiteProperties(Configuration conf, yarnSiteConfig.setLong( CapacitySchedulerConfiguration.PREEMPTION_MONITORING_INTERVAL, waitBeforeNextStarvationCheck); + } else { + if (disablePreemption && (disablePreemptionMode == null + || disablePreemptionMode.isEmpty() || + disablePreemptionMode.equals("nopolicy"))) { + yarnSiteConfig.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, ""); + } + } + + // For auto created queue's auto deletion. + if (!userPercentage) { + String policies = addMonitorPolicy(AutoCreatedQueueDeletionPolicy. + class.getCanonicalName(), yarnSiteConfig); + yarnSiteConfig.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + policies); + + // Set the expired for deletion interval to 10s, consistent with fs. + yarnSiteConfig.setInt(CapacitySchedulerConfiguration. + AUTO_CREATE_CHILD_QUEUE_EXPIRED_TIME, 10); } if (conf.getBoolean(FairSchedulerConfiguration.ASSIGN_MULTIPLE, @@ -132,4 +162,17 @@ public boolean isPreemptionEnabled() { public boolean isSizeBasedWeight() { return sizeBasedWeight; } + + private String addMonitorPolicy(String policyName, + Configuration yarnSiteConfig) { + String policies = + yarnSiteConfig.get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES); + if (policies == null || policies.isEmpty()) { + policies = policyName; + } else { + policies += "," + policyName; + } + return policies; + } + } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java index 5450d409bda..089bcdb99b3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java @@ -31,10 +31,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.RuleAction.ABORT; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.RuleAction.WARNING; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.verify; @@ -50,6 +47,7 @@ import org.apache.hadoop.service.ServiceStateException; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy; import org.apache.hadoop.yarn.server.resourcemanager.placement.PlacementManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.placement.schema.MappingRulesDescription; @@ -687,6 +685,21 @@ public void testConversionWhenAsyncSchedulingIsDisabled() throws Exception { schedulingEnabledValue); } + @Test + public void testSiteDisabledPreemptionWithObserveOnlyConversion() + throws Exception{ + FSConfigToCSConfigConverterParams params = createDefaultParamsBuilder() + .withDisablePreemption(true, "observeonly") + .build(); + + converter.convert(params); + assertEquals("The observe only should be true", + converter.getCapacitySchedulerConfig(). + getBoolean(CapacitySchedulerConfiguration. + PREEMPTION_OBSERVE_ONLY, false), + true); + } + private boolean testConversionWithAsyncSchedulingOption(boolean enabled) throws Exception { FSConfigToCSConfigConverterParams params = createDefaultParamsBuilder() .withClusterResource(CLUSTER_RESOURCE_STRING) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSYarnSiteConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSYarnSiteConverter.java index 9cebf16f8be..f2128294eb4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSYarnSiteConverter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSYarnSiteConverter.java @@ -18,6 +18,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.AutoCreatedQueueDeletionPolicy; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration; import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator; @@ -28,6 +30,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotEquals; /** * Unit tests for FSYarnSiteConverter. @@ -54,7 +57,7 @@ public void testSiteContinuousSchedulingConversion() { FairSchedulerConfiguration.CONTINUOUS_SCHEDULING_SLEEP_MS, 666); converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, - false); + false, false, false, null); assertTrue("Cont. scheduling", yarnConvertedConfig.getBoolean( CapacitySchedulerConfiguration.SCHEDULE_ASYNCHRONOUSLY_ENABLE, false)); @@ -73,7 +76,7 @@ public void testSitePreemptionConversion() { 321); converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, - false); + false, false, false, null); assertTrue("Preemption enabled", yarnConvertedConfig.getBoolean( @@ -87,6 +90,40 @@ public void testSitePreemptionConversion() { yarnConvertedConfig.getInt( CapacitySchedulerConfiguration.PREEMPTION_MONITORING_INTERVAL, -1)); + + assertFalse("Observe_only should be false", + yarnConvertedConfig.getBoolean(CapacitySchedulerConfiguration. + PREEMPTION_OBSERVE_ONLY, false)); + + assertTrue("Should contain ProportionalCapacityPreemptionPolicy.", + yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES). + contains(ProportionalCapacityPreemptionPolicy. + class.getCanonicalName())); + } + + @Test + public void testSiteDisabledPreemptionWithNoPolicyConversion() { + // Default mode is nopolicy + yarnConfig.setBoolean(FairSchedulerConfiguration.PREEMPTION, false); + converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, + false, false, true, null); + + assertFalse("Should not contain ProportionalCapacityPreemptionPolicy.", + yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES). + contains(ProportionalCapacityPreemptionPolicy. + class.getCanonicalName())); + + yarnConfig.setBoolean(FairSchedulerConfiguration.PREEMPTION, false); + converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, + false, false, true, "nopolicy"); + + assertFalse("Should not contain ProportionalCapacityPreemptionPolicy.", + yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES). + contains(ProportionalCapacityPreemptionPolicy. + class.getCanonicalName())); } @Test @@ -94,7 +131,7 @@ public void testSiteAssignMultipleConversion() { yarnConfig.setBoolean(FairSchedulerConfiguration.ASSIGN_MULTIPLE, true); converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, - false); + false, false, false, null); assertTrue("Assign multiple", yarnConvertedConfig.getBoolean( @@ -107,7 +144,7 @@ public void testSiteMaxAssignConversion() { yarnConfig.setInt(FairSchedulerConfiguration.MAX_ASSIGN, 111); converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, - false); + false, false, false, null); assertEquals("Max assign", 111, yarnConvertedConfig.getInt( @@ -122,7 +159,7 @@ public void testSiteLocalityThresholdConversion() { "321.321"); converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, - false); + false, false, false, null); assertEquals("Locality threshold node", "123.123", yarnConvertedConfig.get( @@ -135,7 +172,7 @@ public void testSiteLocalityThresholdConversion() { @Test public void testSiteDrfEnabledConversion() { converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, true, - false); + false, false, false, null); assertEquals("Resource calculator type", DominantResourceCalculator.class, yarnConvertedConfig.getClass( @@ -145,7 +182,7 @@ public void testSiteDrfEnabledConversion() { @Test public void testSiteDrfDisabledConversion() { converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, - false); + false, false, false, null); assertEquals("Resource calculator type", DefaultResourceCalculator.class, yarnConvertedConfig.getClass( @@ -156,7 +193,7 @@ public void testSiteDrfDisabledConversion() { @Test public void testAsyncSchedulingEnabledConversion() { converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, true, - true); + true, false, false, null); assertTrue("Asynchronous scheduling", yarnConvertedConfig.getBoolean( CapacitySchedulerConfiguration.SCHEDULE_ASYNCHRONOUSLY_ENABLE, @@ -166,10 +203,83 @@ public void testAsyncSchedulingEnabledConversion() { @Test public void testAsyncSchedulingDisabledConversion() { converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, - false); + false, false, false, null); assertFalse("Asynchronous scheduling", yarnConvertedConfig.getBoolean( CapacitySchedulerConfiguration.SCHEDULE_ASYNCHRONOUSLY_ENABLE, CapacitySchedulerConfiguration.DEFAULT_SCHEDULE_ASYNCHRONOUSLY_ENABLE)); } + + @Test + public void testSiteQueueAutoDeletionConversionWithWeightMode() { + converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, + false, false, false, null); + assertTrue(yarnConvertedConfig.get(YarnConfiguration. + RM_SCHEDULER_ENABLE_MONITORS), true); + assertTrue("Scheduling Policies contain auto deletion policy", + yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES) + .contains(AutoCreatedQueueDeletionPolicy. + class.getCanonicalName())); + + // Test when policy has existed. + yarnConvertedConfig. + set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + "testPolicy"); + converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, + false, false, false, null); + assertTrue("Scheduling Policies contain auto deletion policy", + yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES) + .contains(AutoCreatedQueueDeletionPolicy. + class.getCanonicalName())); + + assertEquals("Auto deletion policy expired time should be 10s", + 10, yarnConvertedConfig. + getLong(CapacitySchedulerConfiguration. + AUTO_CREATE_CHILD_QUEUE_EXPIRED_TIME, + CapacitySchedulerConfiguration. + DEFAULT_AUTO_CREATE_CHILD_QUEUE_EXPIRED_TIME)); + } + + @Test + public void + testSiteQueueAutoDeletionConversionDisabledForPercentageMode() { + + // test percentage mode + converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, + false, true, false, null); + assertTrue(yarnConvertedConfig.get(YarnConfiguration. + RM_SCHEDULER_ENABLE_MONITORS), true); + + assertTrue("Scheduling Policies should not" + + "contain auto deletion policy in percentage mode", + yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES) == null || + !yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES). + contains(AutoCreatedQueueDeletionPolicy. + class.getCanonicalName())); + + yarnConvertedConfig. + set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + "testPolicy"); + converter.convertSiteProperties(yarnConfig, yarnConvertedConfig, false, + false, true, false, null); + assertFalse("Scheduling Policies should not " + + "contain auto deletion policy in percentage mode", + yarnConvertedConfig. + get(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES) + .contains(AutoCreatedQueueDeletionPolicy. + class.getCanonicalName())); + + assertNotEquals("Auto deletion policy expired time should not " + + "be set in percentage mode", + 10, yarnConvertedConfig. + getLong(CapacitySchedulerConfiguration. + AUTO_CREATE_CHILD_QUEUE_EXPIRED_TIME, + CapacitySchedulerConfiguration. + DEFAULT_AUTO_CREATE_CHILD_QUEUE_EXPIRED_TIME)); + + } }