Repository: hadoop Updated Branches: refs/heads/branch-2 ede909144 -> 42147bbbf refs/heads/branch-2.6.0 e3496499e -> 44fdd1414 refs/heads/trunk 822ae88f7 -> 59ee8b7a8
CLOUDERA-BUILD. Set the Fair Scheduler as the default scheduler. (cherry picked from commit 2608afcdbb6efa3bbf496c2b70a7e2ccde4dd0ba) (cherry picked from commit 30f7dad019e7de2b974360de97a9e841ea5663cc) (cherry picked from commit e55941cca0971855b19a0d42c0ec510d4d464027) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44fdd141 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44fdd141 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44fdd141 Branch: refs/heads/branch-2.6.0 Commit: 44fdd141468f72082c36d24151327ada19da8e46 Parents: e349649 Author: Sandy Ryza <[email protected]> Authored: Fri Jun 21 16:35:24 2013 -0700 Committer: Daniel Templeton <[email protected]> Committed: Sun Sep 4 07:24:08 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/44fdd141/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 83cbfc5..6b991e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -331,7 +331,7 @@ public class YarnConfiguration extends Configuration { RM_PREFIX + "scheduler.class"; public static final String DEFAULT_RM_SCHEDULER = - "org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler"; + "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler"; /** RM set next Heartbeat interval for NM */ public static final String RM_NM_HEARTBEAT_INTERVAL_MS = http://git-wip-us.apache.org/repos/asf/hadoop/blob/44fdd141/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- 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 9d37196..d47ddca 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 @@ -224,7 +224,7 @@ <property> <description>The class to use as the resource scheduler.</description> <name>yarn.resourcemanager.scheduler.class</name> - <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> + <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler</value> </property> <property> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
