YARN-3018. Unified the default value for the configuration property yarn.scheduler.capacity.node-locality-delay in code and default xml file. Contributed by Nijel SF.

(cherry picked from commit f7a74d2491)
This commit is contained in:
Vinod Kumar Vavilapalli 2015-05-08 14:41:33 -07:00
parent f264a5aeed
commit 24c8d3e54b
2 changed files with 6 additions and 3 deletions

View File

@ -157,6 +157,10 @@ Release 2.8.0 - UNRELEASED
YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page. YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page.
(Naganarasimha G R via wangda) (Naganarasimha G R via wangda)
YARN-3018. Unified the default value for the configuration property
yarn.scheduler.capacity.node-locality-delay in code and default xml file.
(Nijel SF via vinodkv)
OPTIMIZATIONS OPTIMIZATIONS
YARN-3339. TestDockerContainerExecutor should pull a single image and not YARN-3339. TestDockerContainerExecutor should pull a single image and not

View File

@ -181,7 +181,7 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur
PREFIX + "node-locality-delay"; PREFIX + "node-locality-delay";
@Private @Private
public static final int DEFAULT_NODE_LOCALITY_DELAY = -1; public static final int DEFAULT_NODE_LOCALITY_DELAY = 40;
@Private @Private
public static final String SCHEDULE_ASYNCHRONOUSLY_PREFIX = public static final String SCHEDULE_ASYNCHRONOUSLY_PREFIX =
@ -664,8 +664,7 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur
} }
public int getNodeLocalityDelay() { public int getNodeLocalityDelay() {
int delay = getInt(NODE_LOCALITY_DELAY, DEFAULT_NODE_LOCALITY_DELAY); return getInt(NODE_LOCALITY_DELAY, DEFAULT_NODE_LOCALITY_DELAY);
return (delay == DEFAULT_NODE_LOCALITY_DELAY) ? 0 : delay;
} }
public ResourceCalculator getResourceCalculator() { public ResourceCalculator getResourceCalculator() {