Merge -r 734869:734870 from trunk to branch-0.20 to fix HADOOP-4906.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@734871 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -583,6 +583,9 @@ Release 0.19.1 - Unreleased
     HADOOP-5008. TestReplication#testPendingReplicationRetry leaves an opened
     fd unclosed. (hairong)
 
+    HADOOP-4906. Fix TaskTracker OOM by keeping a shallow copy of JobConf in
+    TaskTracker.TaskInProgress. (Sharad Agarwal via acmurthy) 
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

src/mapred/org/apache/hadoop/mapred/TaskTracker.java

@@ -372,15 +372,13 @@ public class TaskTracker
       }, "taskCleanup");
     
   private RunningJob addTaskToJob(JobID jobId, 
-                                  Path localJobFile,
                                   TaskInProgress tip) {
     synchronized (runningJobs) {
       RunningJob rJob = null;
       if (!runningJobs.containsKey(jobId)) {
-        rJob = new RunningJob(jobId, localJobFile);
+        rJob = new RunningJob(jobId);
         rJob.localized = false;
         rJob.tasks = new HashSet<TaskInProgress>();
-        rJob.jobFile = localJobFile;
         runningJobs.put(jobId, rJob);
       } else {
         rJob = runningJobs.get(jobId);
@@ -762,7 +760,7 @@ public class TaskTracker
                                     + Path.SEPARATOR + jobId 
                                     + Path.SEPARATOR + "job.xml"),
                                     jobFileSize, fConf);
-    RunningJob rjob = addTaskToJob(jobId, localJobFile, tip);
+    RunningJob rjob = addTaskToJob(jobId, tip);
     synchronized (rjob) {
       if (!rjob.localized) {
   
@@ -830,9 +828,10 @@ public class TaskTracker
         rjob.keepJobFiles = ((localJobConf.getKeepTaskFilesPattern() != null) ||
                              localJobConf.getKeepFailedTaskFiles());
         rjob.localized = true;
+        rjob.jobConf = localJobConf;
       }
     }
-    launchTaskForJob(tip, new JobConf(rjob.jobFile)); 
+    launchTaskForJob(tip, new JobConf(rjob.jobConf)); 
   }
 
   private void launchTaskForJob(TaskInProgress tip, JobConf jobConf) throws IOException{
@@ -2600,24 +2599,19 @@ public class TaskTracker
    */
   static class RunningJob{
     private JobID jobid; 
-    private Path jobFile;
+    private JobConf jobConf;
     // keep this for later use
     volatile Set<TaskInProgress> tasks;
     boolean localized;
     boolean keepJobFiles;
     FetchStatus f;
-    RunningJob(JobID jobid, Path jobFile) {
+    RunningJob(JobID jobid) {
       this.jobid = jobid;
       localized = false;
       tasks = new HashSet<TaskInProgress>();
-      this.jobFile = jobFile;
       keepJobFiles = false;
     }
       
-    Path getJobFile() {
-      return jobFile;
-    }
-      
     JobID getJobID() {
       return jobid;
     }