From 8134ed9554a19367b6a9f6227c10d57d055dfea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Hud=C3=A1ky?= Date: Fri, 19 Jun 2020 11:36:30 +0200 Subject: [PATCH] YARN-10279.003 --- .../placement/QueuePlacementRuleUtils.java | 7 +------ .../placement/UserGroupMappingPlacementRule.java | 14 ++------------ 2 files changed, 3 insertions(+), 18 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/placement/QueuePlacementRuleUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/QueuePlacementRuleUtils.java index 15c8fd8b708..76e3e275fc9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/QueuePlacementRuleUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/QueuePlacementRuleUtils.java @@ -74,12 +74,7 @@ public static QueueMapping validateAndGetAutoCreatedQueueMapping( validateQueueMappingUnderParentQueue(queueManager.getQueue( mapping.getParentQueue()), mapping.getParentQueue(), mapping.getFullPath()); - return QueueMapping.QueueMappingBuilder.create() - .type(mapping.getType()) - .source(mapping.getSource()) - .parentQueue(mapping.getParentQueue()) - .queue(mapping.getQueue()) - .build(); + return mapping; } return null; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java index 0e8cb9cc047..43fa9203eb4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java @@ -485,24 +485,14 @@ private static QueueMapping validateAndGetAutoCreatedQueueMapping( && (mapping.getParentQueue().equals(PRIMARY_GROUP_MAPPING) || mapping.getParentQueue().equals(SECONDARY_GROUP_MAPPING))) { // dynamic parent queue - return QueueMappingBuilder.create() - .type(mapping.getType()) - .source(mapping.getSource()) - .queue(mapping.getQueue()) - .parentQueue(mapping.getParentQueue()) - .build(); + return mapping; } else if (mapping.hasParentQueue()) { //if parent queue is specified, // then it should exist and be an instance of ManagedParentQueue QueuePlacementRuleUtils.validateQueueMappingUnderParentQueue( queueManager.getQueue(mapping.getParentQueue()), mapping.getParentQueue(), mapping.getQueue()); - return QueueMappingBuilder.create() - .type(mapping.getType()) - .source(mapping.getSource()) - .queue(mapping.getQueue()) - .parentQueue(mapping.getParentQueue()) - .build(); + return mapping; } return null; -- 2.24.1 (Apple Git-126)