Repository: hadoop Updated Branches: refs/heads/trunk 1a625b815 -> 6cbd9f111
YARN-3247. TestQueueMappings should use CapacityScheduler explicitly. Contributed by Zhihai Xu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6cbd9f11 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6cbd9f11 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6cbd9f11 Branch: refs/heads/trunk Commit: 6cbd9f1113fca9ff86fd6ffa783ecd54b147e0db Parents: 1a625b8 Author: Tsuyoshi Ozawa <[email protected]> Authored: Wed Feb 25 10:34:28 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Wed Feb 25 10:38:11 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../resourcemanager/scheduler/capacity/TestQueueMappings.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cbd9f11/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 39e2dc0..2d11ed7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -652,6 +652,9 @@ Release 2.7.0 - UNRELEASED YARN-3238. Connection timeouts to nodemanagers are retried at multiple levels (Jason Lowe via xgong) + YARN-3247. TestQueueMappings should use CapacityScheduler explicitly. + (Zhihai Xu via ozawa) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cbd9f11/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java index 2317fab..005f40b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java @@ -135,6 +135,8 @@ public class TestQueueMappings { checkQMapping("a", Q1, cs); csConf = new CapacitySchedulerConfiguration(); + csConf.set(YarnConfiguration.RM_SCHEDULER, + CapacityScheduler.class.getName()); setupQueueConfiguration(csConf); conf = new YarnConfiguration(csConf);
