Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-10454: Add applicationName policy. Contributed by Peter Bacsko

This commit is contained in:
Szilard Nemeth 2020-10-13 10:11:10 +02:00
parent b3786d6c3c
commit 42358169f6
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/placement/MappingRuleCreator.java
View File

@ -166,6 +166,11 @@ public class MappingRuleCreator {
getTargetQueue(rule.getParentQueue(), getTargetQueue(rule.getParentQueue(),
"%user"), create); "%user"), create);
break; break;
case APPLICATION_NAME:
action = MappingRuleActions.createPlaceToQueueAction(
getTargetQueue(rule.getParentQueue(),
"%application"), create);
break;
case SET_DEFAULT_QUEUE: case SET_DEFAULT_QUEUE:
String defaultQueue = rule.getValue(); String defaultQueue = rule.getValue();
checkArgument(defaultQueue != null, "default queue is undefined"); checkArgument(defaultQueue != null, "default queue is undefined");

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/json_schema/MappingRulesDescription.json
View File

@ -40,6 +40,7 @@
"secondaryGroup", "secondaryGroup",
"primaryGroupUser", "primaryGroupUser",
"secondaryGroupUser", "secondaryGroupUser",
"applicationName",
"setDefaultQueue", "setDefaultQueue",
"custom" ] }, "custom" ] },
"parentQueue": { "type": "string" }, "parentQueue": { "type": "string" },

17
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/placement/TestMappingRuleCreator.java
View File

@ -43,7 +43,7 @@ public class TestMappingRuleCreator {
private static final String DEFAULT_QUEUE = "root.default"; private static final String DEFAULT_QUEUE = "root.default";
private static final String SECONDARY_GROUP = "users"; private static final String SECONDARY_GROUP = "users";
private static final String PRIMARY_GROUP = "superuser"; private static final String PRIMARY_GROUP = "superuser";
private static final String APPLICATION_NAME = "MapReduce"; private static final String APPLICATION_NAME = "testapplication";
private static final String SPECIFIED_QUEUE = "root.users.hadoop"; private static final String SPECIFIED_QUEUE = "root.users.hadoop";
private static final String USER_NAME = "testuser"; private static final String USER_NAME = "testuser";
@ -316,6 +316,21 @@ public class TestMappingRuleCreator {
verifyPlacementSucceeds("root.users.testuser"); verifyPlacementSucceeds("root.users.testuser");
} }
@Test
public void testApplicationNamePlacement() {
rule.setPolicy(Policy.APPLICATION_NAME);
verifyPlacementSucceeds(APPLICATION_NAME);
}
@Test
public void testApplicationNamePlacementWithParent() {
rule.setPolicy(Policy.APPLICATION_NAME);
rule.setParentQueue("root.applications");
verifyPlacementSucceeds("root.applications." + APPLICATION_NAME);
}
@Test @Test
public void testDefaultQueueFallback() { public void testDefaultQueueFallback() {
rule.setFallbackResult(FallbackResult.PLACE_DEFAULT); rule.setFallbackResult(FallbackResult.PLACE_DEFAULT);