This is an automated email from the ASF dual-hosted git repository. aajisaka 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 56d8071 YARN-11081. TestYarnConfigurationFields consistently keeps failing (#4027) 56d8071 is described below commit 56d807175d87da40f39b6a5c59519da15a38aa30 Author: Viraj Jasani <vjas...@apache.org> AuthorDate: Tue Mar 8 18:02:51 2022 +0530 YARN-11081. TestYarnConfigurationFields consistently keeps failing (#4027) Signed-off-by: Akira Ajisaka <aajis...@apache.org> --- .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 13 +++++++++++++ .../scheduler/ApplicationPlacementAllocatorFactory.java | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index 53b6b14..3921262 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -4846,4 +4846,17 @@ <name>yarn.resourcemanager.enable-node-untracked-without-include-path</name> <value>false</value> </property> + + <property> + <name>yarn.scheduler.app-placement-allocator.class</name> + <value></value> + <description> + In the absence of APPLICATION_PLACEMENT_TYPE_CLASS from the RM + application scheduling environments, the value of this config + is used to determine the default implementation of AppPlacementAllocator. + If APPLICATION_PLACEMENT_TYPE_CLASS is absent from the application + scheduling env and this config also has no value present, then + default implementation LocalityAppPlacementAllocator is used. + </description> + </property> </configuration> 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/ApplicationPlacementAllocatorFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ApplicationPlacementAllocatorFactory.java index a4e5484..71d657d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ApplicationPlacementAllocatorFactory.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ApplicationPlacementAllocatorFactory.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.util.ReflectionUtils; @@ -45,7 +46,7 @@ public class ApplicationPlacementAllocatorFactory { SchedulerRequestKey schedulerRequestKey, RMContext rmContext) { Class<?> policyClass; try { - if (appPlacementAllocatorName == null) { + if (StringUtils.isEmpty(appPlacementAllocatorName)) { policyClass = ApplicationSchedulingConfig.DEFAULT_APPLICATION_PLACEMENT_TYPE_CLASS; } else { policyClass = Class.forName(appPlacementAllocatorName); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org