big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-10605. Add queue-mappings-override.enable property in FS2CS conversions. Contributed by Andras Gyori

Browse Source
This commit is contained in:
Szilard Nemeth 2021-02-02 09:13:46 +01:00
parent 7d88953768
commit 9bf2ac07bb
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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
View File

@ -339,6 +339,7 @@ private void performRuleConversion(FairScheduler fs)
capacitySchedulerConfig.set(MAPPING_RULE_FORMAT, capacitySchedulerConfig.set(MAPPING_RULE_FORMAT,
MAPPING_RULE_FORMAT_JSON); MAPPING_RULE_FORMAT_JSON);
capacitySchedulerConfig.setOverrideWithQueueMappings(true);
if (!rulesToFile) { if (!rulesToFile) {
String json = String json =
((ByteArrayOutputStream)mappingRulesOutputStream) ((ByteArrayOutputStream)mappingRulesOutputStream)

2
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
View File

@ -668,6 +668,8 @@ public void testPlacementRulesConversionEnabled() throws Exception {
any(FSConfigToCSConfigRuleHandler.class), any(FSConfigToCSConfigRuleHandler.class),
any(CapacitySchedulerConfiguration.class), any(CapacitySchedulerConfiguration.class),
anyBoolean()); anyBoolean());
assertTrue(converter.getCapacitySchedulerConfig().getBoolean(
CapacitySchedulerConfiguration.ENABLE_QUEUE_MAPPING_OVERRIDE, false));
} }
@Test @Test