Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -c 1225726 from trunk to branch-0.23 to fix MAPREDUCE-3608. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225728 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-12-30 02:24:46 +00:00
parent a178401dc9
commit 01b14ae65f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -327,6 +327,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3522. Ensure queues inherit ACLs from parent if they aren't MAPREDUCE-3522. Ensure queues inherit ACLs from parent if they aren't
explicitly specified. (Jonathan Eagles via acmurthy) explicitly specified. (Jonathan Eagles via acmurthy)
MAPREDUCE-3608. Fixed compile issue with MAPREDUCE-3522. (mahadev via
acmurthy)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
View File

@ -93,14 +93,14 @@ public class TestRMWebServicesCapacitySched extends JerseyTest {
CapacitySchedulerConfiguration conf) { CapacitySchedulerConfiguration conf) {
// Define top-level queues // Define top-level queues
conf.setQueues(CapacityScheduler.ROOT, new String[] { "a", "b" }); conf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] { "a", "b" });
conf.setCapacity(CapacityScheduler.ROOT, 100); conf.setCapacity(CapacitySchedulerConfiguration.ROOT, 100);
final String A = CapacityScheduler.ROOT + ".a"; final String A = CapacitySchedulerConfiguration.ROOT + ".a";
conf.setCapacity(A, 10); conf.setCapacity(A, 10);
conf.setMaximumCapacity(A, 50); conf.setMaximumCapacity(A, 50);
final String B = CapacityScheduler.ROOT + ".b"; final String B = CapacitySchedulerConfiguration.ROOT + ".b";
conf.setCapacity(B, 90); conf.setCapacity(B, 90);
// Define 2nd-level queues // Define 2nd-level queues
@ -209,7 +209,7 @@ public class TestRMWebServicesCapacitySched extends JerseyTest {
for (int j = 0; j < queues.getLength(); j++) { for (int j = 0; j < queues.getLength(); j++) {
Element qElem = (Element) queues.item(j); Element qElem = (Element) queues.item(j);
String qName = WebServicesTestUtils.getXmlString(qElem, "queueName"); String qName = WebServicesTestUtils.getXmlString(qElem, "queueName");
String q = CapacityScheduler.ROOT + "." + qName; String q = CapacitySchedulerConfiguration.ROOT + "." + qName;
verifySubQueueXML(qElem, q); verifySubQueueXML(qElem, q);
} }
} }
@ -253,7 +253,7 @@ public class TestRMWebServicesCapacitySched extends JerseyTest {
// test subqueues // test subqueues
for (int i = 0; i < arr.length(); i++) { for (int i = 0; i < arr.length(); i++) {
JSONObject obj = arr.getJSONObject(i); JSONObject obj = arr.getJSONObject(i);
String q = CapacityScheduler.ROOT + "." + obj.getString("queueName"); String q = CapacitySchedulerConfiguration.ROOT + "." + obj.getString("queueName");
verifySubQueue(obj, q); verifySubQueue(obj, q);
} }
} }