You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/05/08 23:45:25 UTC
hadoop git commit: 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.
Repository: hadoop
Updated Branches:
refs/heads/trunk 2d4ae3d18 -> f7a74d249
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.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f7a74d24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f7a74d24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f7a74d24
Branch: refs/heads/trunk
Commit: f7a74d249173292035839810a1595d7a028bfdda
Parents: 2d4ae3d
Author: Vinod Kumar Vavilapalli <vi...@apache.org>
Authored: Fri May 8 14:41:33 2015 -0700
Committer: Vinod Kumar Vavilapalli <vi...@apache.org>
Committed: Fri May 8 14:45:06 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 4 ++++
.../scheduler/capacity/CapacitySchedulerConfiguration.java | 5 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7a74d24/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 7927d43..47f689c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -202,6 +202,10 @@ Release 2.8.0 - UNRELEASED
YARN-3593. Add label-type and Improve "DEFAULT_PARTITION" in Node Labels Page.
(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
YARN-3339. TestDockerContainerExecutor should pull a single image and not
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7a74d24/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
----------------------------------------------------------------------
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 55e360d..031ca5d 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
@@ -181,7 +181,7 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur
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 =
@@ -664,8 +664,7 @@ public class CapacitySchedulerConfiguration extends ReservationSchedulerConfigur
}
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() {