From 868eb5daaea4f115a36b06a1882306b568e81351 Mon Sep 17 00:00:00 2001 From: Craig Condit Date: Thu, 30 May 2019 09:54:33 -0500 Subject: [PATCH] YARN-9569. Auto-created leaf queues do not honor cluster-wide min/max memory/vcores --- .../scheduler/capacity/AbstractManagedParentQueue.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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/AbstractManagedParentQueue.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/AbstractManagedParentQueue.java index 3e90863e5df..7626c66d555 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/AbstractManagedParentQueue.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/AbstractManagedParentQueue.java @@ -19,6 +19,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerDynamicEditException; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common @@ -200,6 +201,13 @@ protected CapacitySchedulerConfiguration initializeLeafQueueConfigs(String CapacitySchedulerConfiguration leafQueueConfigs = new CapacitySchedulerConfiguration(new Configuration(false), false); + String prefix = YarnConfiguration.RESOURCE_TYPES + "."; + Map rtProps = csContext + .getConfiguration().getPropsWithPrefix(prefix); + for (Map.Entry entry : rtProps.entrySet()) { + leafQueueConfigs.set(prefix + entry.getKey(), entry.getValue()); + } + SortedMap sortedConfigs = sortCSConfigurations(); SortedMap templateConfigs = getConfigurationsWithPrefix (sortedConfigs, configPrefix); -- 2.21.0