This is an automated email from the ASF dual-hosted git repository.
varunsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2a0dc2ab2f5 YARN-11383. Workflow priority mappings is case sensitive
(#5171)
2a0dc2ab2f5 is described below
commit 2a0dc2ab2f5fb46dc540ed440d6c8b2896dd195b
Author: Varun Saxena <varunsax...@apache.org>
AuthorDate: Sun Mar 5 21:25:16 2023 +0530
YARN-11383. Workflow priority mappings is case sensitive (#5171)
Contributed by Aparajita Choudhary
---
.../capacity/WorkflowPriorityMappingsManager.java | 20 ++++++++++----------
...TestCapacitySchedulerWorkflowPriorityMapping.java | 16 +++++-----------
2 files changed, 15 insertions(+), 21 deletions(-)
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/capacity/WorkflowPriorityMappingsManager.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
index e9a52d21b4f..ec05b134911 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/WorkflowPriorityMappingsManager.java
@@ -56,8 +56,8 @@ public class WorkflowPriorityMappingsManager {
private boolean overrideWithPriorityMappings = false;
// Map of queue to a map of workflow ID to priority
- private Map<String, Map<String, WorkflowPriorityMapping>> priorityMappings =
- new HashMap<String, Map<String, WorkflowPriorityMapping>>();
+ private Map<String, Map<String, Priority>> priorityMappings =
+ new HashMap<>();
public static class WorkflowPriorityMapping {
String workflowID;
@@ -115,10 +115,9 @@ public class WorkflowPriorityMappingsManager {
*
* @return workflowID to priority mappings for a queue
*/
- public Map<String, Map<String, WorkflowPriorityMapping>>
+ public Map<String, Map<String, Priority>>
getWorkflowPriorityMappings() {
- Map<String, Map<String, WorkflowPriorityMapping>> mappings =
- new HashMap<String, Map<String, WorkflowPriorityMapping>>();
+ Map<String, Map<String, Priority>> mappings = new HashMap<>();
Collection<String> workflowMappings = conf.getWorkflowPriorityMappings();
for (String workflowMapping : workflowMappings) {
@@ -127,9 +126,9 @@ public class WorkflowPriorityMappingsManager {
if (mapping != null) {
if (!mappings.containsKey(mapping.queue)) {
mappings.put(mapping.queue,
- new HashMap<String, WorkflowPriorityMapping>());
+ new HashMap<String, Priority>());
}
- mappings.get(mapping.queue).put(mapping.workflowID, mapping);
+ mappings.get(mapping.queue).put(mapping.workflowID, mapping.priority);
}
}
return mappings;
@@ -150,8 +149,9 @@ public class WorkflowPriorityMappingsManager {
}
WorkflowPriorityMapping mapping;
try {
- mapping = new WorkflowPriorityMapping(mappingArray[0], mappingArray[1],
- Priority.newInstance(Integer.parseInt(mappingArray[2])));
+ //Converting workflow id to lowercase as yarn converts application tags
also to lowercase
+ mapping = new
WorkflowPriorityMapping(StringUtils.toLowerCase(mappingArray[0]),
+ mappingArray[1],
Priority.newInstance(Integer.parseInt(mappingArray[2])));
} catch (NumberFormatException e) {
throw new IllegalArgumentException(
"Illegal workflow priority for mapping " + mappingString);
@@ -168,7 +168,7 @@ public class WorkflowPriorityMappingsManager {
String queuePath = queue.getQueuePath();
if (priorityMappings.containsKey(queuePath)
&& priorityMappings.get(queuePath).containsKey(workflowID)) {
- return priorityMappings.get(queuePath).get(workflowID).priority;
+ return priorityMappings.get(queuePath).get(workflowID);
} else {
queue = queue.getParent();
return getMappedPriority(workflowID, queue);
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/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
index 442c952ba12..d1931b71939 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacitySchedulerWorkflowPriorityMapping.java
@@ -78,7 +78,7 @@ public class TestCapacitySchedulerWorkflowPriorityMapping {
List<WorkflowPriorityMapping> mappings = Arrays.asList(
new WorkflowPriorityMapping("workflow1", B, Priority.newInstance(2)),
new WorkflowPriorityMapping("workflow2", A1, Priority.newInstance(3)),
- new WorkflowPriorityMapping("workflow3", A, Priority.newInstance(4)));
+ new WorkflowPriorityMapping("Workflow3", A, Priority.newInstance(4)));
conf.setWorkflowPriorityMappings(mappings);
}
@@ -99,16 +99,10 @@ public class TestCapacitySchedulerWorkflowPriorityMapping {
mockRM.start();
cs.start();
- Map<String, Map<String, Object>> expected = ImmutableMap.of(
- A, ImmutableMap.of("workflow3",
- new WorkflowPriorityMapping(
- "workflow3", A, Priority.newInstance(4))),
- B, ImmutableMap.of("workflow1",
- new WorkflowPriorityMapping(
- "workflow1", B, Priority.newInstance(2))),
- A1, ImmutableMap.of("workflow2",
- new WorkflowPriorityMapping(
- "workflow2", A1, Priority.newInstance(3))));
+ Map<String, Object> expected = ImmutableMap.of(
+ A, ImmutableMap.of("workflow3", Priority.newInstance(4)),
+ B, ImmutableMap.of("workflow1", Priority.newInstance(2)),
+ A1, ImmutableMap.of("workflow2", Priority.newInstance(3)));
assertEquals(expected, cs.getWorkflowPriorityMappingsManager()
.getWorkflowPriorityMappings());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
