svn commit: r1063811 - in /hadoop/mapreduce/trunk: CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java

[to...@apache.org]

Author: todd
Date: Wed Jan 26 18:15:53 2011
New Revision: 1063811

URL: http://svn.apache.org/viewvc?rev=1063811&view=rev
Log:
MAPREDUCE-2271. Fix TestSetupTaskScheduling failure on trunk. Contributed by Liyin Liang.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1063811&r1=1063810&r2=1063811&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Wed Jan 26 18:15:53 2011
@@ -45,6 +45,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2232. Add missing methods to TestMapredGroupMappingServiceRefresh.
     (Todd Lipcon via eli)
 
+    MAPREDUCE-2271. Fix TestSetupTaskScheduling failure on trunk.
+    (Liyin Liang via todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java?rev=1063811&r1=1063810&r2=1063811&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java (original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSetupTaskScheduling.java Wed Jan 26 18:15:53 2011
@@ -322,11 +322,6 @@ public class TestSetupTaskScheduling ext
     List<TaskStatus> taskStatuses = new ArrayList<TaskStatus>();
     TaskTrackerStatus ttStatus =
       createTaskTrackerStatus(trackers[0], taskStatuses);//create dummy status
-    addNewTaskStatus(job, TaskType.TASK_CLEANUP, true, trackers[0],
-                     taskStatuses);// status of map task's cleanup task
-    addNewTaskStatus(job, TaskType.TASK_CLEANUP, false, trackers[0],
-                     taskStatuses);// status of reduce task's cleanup task
-    ttStatus = createTaskTrackerStatus(trackers[0], taskStatuses);
     
     // validate mapTaskCleanup task
     validateNumSlotsUsedForTaskCleanup(ttStatus);