From 6cbd9f1113fca9ff86fd6ffa783ecd54b147e0db Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Wed, 25 Feb 2015 10:34:28 +0900 Subject: [PATCH] YARN-3247. TestQueueMappings should use CapacityScheduler explicitly. Contributed by Zhihai Xu. --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../resourcemanager/scheduler/capacity/TestQueueMappings.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 39e2dc04513..2d11ed73f6f 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 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 2317fab17a6..005f40bcadd 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);