hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r705146 - in /hadoop/core/branches/branch-0.19: CHANGES.txt src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
Date Thu, 16 Oct 2008 05:59:07 GMT
Author: ddas
Date: Wed Oct 15 22:59:06 2008
New Revision: 705146

URL: http://svn.apache.org/viewvc?rev=705146&view=rev
Log:
Merge -r 705144:705145 from trunk onto 0.19 branch. Fixes HADOOP-4426.

Modified:
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=705146&r1=705145&r2=705146&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Wed Oct 15 22:59:06 2008
@@ -878,6 +878,9 @@
     HADOOP-4335. Fix FsShell -ls for filesystems without owners/groups. (David
     Phillips via cdouglas)
 
+    HADOOP-4426. TestCapacityScheduler broke due to the two commits HADOOP-4053
+    and HADOOP-4373. This patch fixes that. (Hemanth Yamijala via ddas)
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

Modified: hadoop/core/branches/branch-0.19/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java?rev=705146&r1=705145&r2=705146&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
(original)
+++ hadoop/core/branches/branch-0.19/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java
Wed Oct 15 22:59:06 2008
@@ -468,7 +468,7 @@
     taskTrackerManager.addQueues(new String[] {"default"});
     resConf = new FakeResourceManagerConf();
     ArrayList<FakeQueueInfo> queues = new ArrayList<FakeQueueInfo>();
-    queues.add(new FakeQueueInfo("default", 1f, 1, true, 1));
+    queues.add(new FakeQueueInfo("default", 100.0f, 1, true, 1));
     resConf.setFakeQueues(queues);
     scheduler.setResourceManagerConf(resConf);
     scheduler.start();
@@ -656,10 +656,10 @@
     scheduler.start();
    
     // submit a job to the default queue
-    submitJob(JobStatus.PREP, 10, 0, "default", "u1");
+    submitJobAndInit(JobStatus.PREP, 10, 0, "default", "u1");
     
     // submit a job to the second queue
-    submitJob(JobStatus.PREP, 10, 0, "q2", "u1");
+    submitJobAndInit(JobStatus.PREP, 10, 0, "q2", "u1");
     
     // job from q2 runs first because it has some non-zero capacity.
     checkAssignment("tt1", "attempt_test_0002_m_000001_0 on tt1");



Mime
View raw message