diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java index 529d63b..3004101 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java @@ -114,6 +114,30 @@ public void initializeMemberVariables() { configurationPrefixToSkipCompare .add(YarnConfiguration.NM_CPU_RESOURCE_ENABLED); + // Ignore Distributed Scheduling Related Configurations. + // Since it is still a "work in progress" feature + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_ENABLED); + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_INCR_MEMORY); + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_INCR_VCORES); + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_MAX_MEMORY); + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_MAX_VCORES); + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_CONTAINER_TOKEN_EXPIRY_MS); + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_MIN_MEMORY); + configurationPrefixToSkipCompare + .add(YarnConfiguration.DIST_SCHEDULING_MIN_VCORES); + + // Ignore NM Container Queuing + // Since it is still a "work in progress" feature + configurationPrefixToSkipCompare + .add(YarnConfiguration.NM_CONTAINER_QUEUING_ENABLED); + // Set by container-executor.cfg configurationPrefixToSkipCompare.add(YarnConfiguration.NM_USER_HOME_DIR); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java index 73c2725..c955a5d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java @@ -178,8 +178,8 @@ public ContainerRequest(Resource capability, String[] nodes, */ public ContainerRequest(Resource capability, String[] nodes, String[] racks, Priority priority, boolean relaxLocality, String nodeLabelsExpression) { - this(capability, nodes, racks, priority, relaxLocality, null, - ExecutionType.GUARANTEED); + this(capability, nodes, racks, priority, relaxLocality, + nodeLabelsExpression, ExecutionType.GUARANTEED); } /**