svn commit: r1077007 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java

[omalley]

Author: omalley
Date: Fri Mar  4 03:29:51 2011
New Revision: 1077007

URL: http://svn.apache.org/viewvc?rev=1077007&view=rev
Log:
commit bc235e1a213907a77641ffbb10df414f3ae9b406
Author: Arun C Murthy <acmur...@apache.org>
Date:   Mon Sep 28 13:54:07 2009 -0700

    MAPREDUCE-1028. Fixed number of slots occupied by cleanup tasks to one 
irrespective of slot size for the job. Contributed by Ravi Gummadi.
    
    from: 
http://issues.apache.org/jira/secure/attachment/12420581/yhadoop-0.20-MR1028.patch
    
    +++ b/YAHOO-CHANGES.txt
    +58. MAPREDUCE-1028. Fixed number of slots occupied by cleanup tasks to one
    +    irrespective of slot size for the job. Contributed by Ravi Gummadi.
    +

Modified:
    
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java?rev=1077007&r1=1077006&r2=1077007&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
 Fri Mar  4 03:29:51 2011
@@ -921,6 +921,8 @@ class TaskInProgress {
   public Task addRunningTask(TaskAttemptID taskid, 
                              String taskTracker,
                              boolean taskCleanup) {
+    // 1 slot is enough for taskCleanup task
+    int numSlotsNeeded = taskCleanup ? 1 : numSlotsRequired;
     // create the task
     Task t = null;
     if (isMapTask()) {
@@ -935,10 +937,10 @@ class TaskInProgress {
         split = new BytesWritable();
       }
       t = new MapTask(jobFile, taskid, partition, splitClass, split, 
-                      numSlotsRequired, job.getUser());
+                      numSlotsNeeded, job.getUser());
     } else {
       t = new ReduceTask(jobFile, taskid, partition, numMaps, 
-                         numSlotsRequired, job.getUser());
+                         numSlotsNeeded, job.getUser());
     }
     if (jobCleanup) {
       t.setJobCleanupTask();