Repository: hadoop Updated Branches: refs/heads/branch-2.6.0 44fdd1414 -> 37b2bc8c4
Revert "CLOUDERA-BUILD. Set the Fair Scheduler as the default scheduler." This reverts commit 44fdd141468f72082c36d24151327ada19da8e46. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/37b2bc8c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/37b2bc8c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/37b2bc8c Branch: refs/heads/branch-2.6.0 Commit: 37b2bc8c469902c7de3836a333f388a65977c650 Parents: 44fdd14 Author: Daniel Templeton <[email protected]> Authored: Wed Nov 9 13:20:51 2016 -0800 Committer: Daniel Templeton <[email protected]> Committed: Wed Nov 9 13:20:51 2016 -0800 ---------------------------------------------------------------------- .../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/37b2bc8c/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 6b991e7..83cbfc5 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.fair.FairScheduler"; + "org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler"; /** 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/37b2bc8c/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 d47ddca..9d37196 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.fair.FairScheduler</value> + <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> </property> <property> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
