From 4ab6ae543e5f95e21e60be5c971b177164509c24 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Fri, 30 Dec 2011 02:24:14 +0000 Subject: [PATCH] MAPREDUCE-3608. Fixed compile issue with MAPREDUCE-3522. Contributed by Mahadev Konar. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225726 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../webapp/TestRMWebServicesCapacitySched.java | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2529cacfd31..3917acae289 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -381,6 +381,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3522. Ensure queues inherit ACLs from parent if they aren't explicitly specified. (Jonathan Eagles via acmurthy) + MAPREDUCE-3608. Fixed compile issue with MAPREDUCE-3522. (mahadev via + acmurthy) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 0ffe8a98e2f..dc89381b3df 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -93,14 +93,14 @@ private static void setupQueueConfiguration( CapacitySchedulerConfiguration conf) { // Define top-level queues - conf.setQueues(CapacityScheduler.ROOT, new String[] { "a", "b" }); - conf.setCapacity(CapacityScheduler.ROOT, 100); + conf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] { "a", "b" }); + conf.setCapacity(CapacitySchedulerConfiguration.ROOT, 100); - final String A = CapacityScheduler.ROOT + ".a"; + final String A = CapacitySchedulerConfiguration.ROOT + ".a"; conf.setCapacity(A, 10); conf.setMaximumCapacity(A, 50); - final String B = CapacityScheduler.ROOT + ".b"; + final String B = CapacitySchedulerConfiguration.ROOT + ".b"; conf.setCapacity(B, 90); // Define 2nd-level queues @@ -209,7 +209,7 @@ public void verifyClusterSchedulerXML(NodeList nodes) throws Exception { for (int j = 0; j < queues.getLength(); j++) { Element qElem = (Element) queues.item(j); String qName = WebServicesTestUtils.getXmlString(qElem, "queueName"); - String q = CapacityScheduler.ROOT + "." + qName; + String q = CapacitySchedulerConfiguration.ROOT + "." + qName; verifySubQueueXML(qElem, q); } } @@ -253,7 +253,7 @@ private void verifyClusterScheduler(JSONObject json) throws JSONException, // test subqueues for (int i = 0; i < arr.length(); i++) { JSONObject obj = arr.getJSONObject(i); - String q = CapacityScheduler.ROOT + "." + obj.getString("queueName"); + String q = CapacitySchedulerConfiguration.ROOT + "." + obj.getString("queueName"); verifySubQueue(obj, q); } }