.../scheduler/capacity/CapacitySchedulerConfiguration.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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/CapacitySchedulerConfiguration.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/CapacitySchedulerConfiguration.java index b00f25c..01134ab 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/CapacitySchedulerConfiguration.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/CapacitySchedulerConfiguration.java @@ -178,7 +178,7 @@ PREFIX + "node-locality-delay"; @Private - public static final int DEFAULT_NODE_LOCALITY_DELAY = -1; + public static final int DEFAULT_NODE_LOCALITY_DELAY = 40; @Private public static final String SCHEDULE_ASYNCHRONOUSLY_PREFIX = @@ -661,8 +661,7 @@ public boolean getEnableUserMetrics() { } public int getNodeLocalityDelay() { - int delay = getInt(NODE_LOCALITY_DELAY, DEFAULT_NODE_LOCALITY_DELAY); - return (delay == DEFAULT_NODE_LOCALITY_DELAY) ? 0 : delay; + return getInt(NODE_LOCALITY_DELAY, DEFAULT_NODE_LOCALITY_DELAY); } public ResourceCalculator getResourceCalculator() {