hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1455283 - in /hadoop/common/branches/branch-1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/Child.java src/mapred/org/apache/hadoop/mapred/MapTask.java src/mapred/org/apache/hadoop/mapred/Task.java
Date Mon, 11 Mar 2013 18:57:46 GMT
Author: tucu
Date: Mon Mar 11 18:57:46 2013
New Revision: 1455283

URL: http://svn.apache.org/r1455283
Log:
MAPREDUCE-5047. keep.failed.task.files=true causes job failure on secure clusters. (sandyr
via tucu)

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Child.java
    hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MapTask.java
    hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1455283&r1=1455282&r2=1455283&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Mar 11 18:57:46 2013
@@ -10,6 +10,8 @@ Release 1.3.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-5047. keep.failed.task.files=true causes job failure on 
+    secure clusters. (sandyr via tucu)
 
 Release 1.2.0 - unreleased
 

Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Child.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Child.java?rev=1455283&r1=1455282&r2=1455283&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Child.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Child.java Mon Mar
11 18:57:46 2013
@@ -335,6 +335,11 @@ class Child {
     // Do the task-type specific localization
     task.localizeConfiguration(jobConf);
     
+    // Write files required to re-run the task with IsolationRunner
+    if (task.supportIsolationRunner(jobConf)) {
+      task.writeFilesRequiredForRerun(jobConf);
+    }
+    
     //write the localized task jobconf
     LocalDirAllocator lDirAlloc = 
       new LocalDirAllocator(JobConf.MAPRED_LOCAL_DIR_PROPERTY);

Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MapTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MapTask.java?rev=1455283&r1=1455282&r2=1455283&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MapTask.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MapTask.java Mon Mar
11 18:57:46 2013
@@ -109,15 +109,14 @@ class MapTask extends Task {
   }
 
   @Override
-  public void localizeConfiguration(JobConf conf)
+  public void writeFilesRequiredForRerun(JobConf conf)
       throws IOException {
-    super.localizeConfiguration(conf);
     // split.info file is used only by IsolationRunner.
     // Write the split file to the local disk if it is a normal map task (not a
     // job-setup or a job-cleanup task) and if the user wishes to run
     // IsolationRunner either by setting keep.failed.tasks.files to true or by
     // using keep.tasks.files.pattern
-    if (supportIsolationRunner(conf) && isMapOrReduce()) {
+    if (isMapOrReduce()) {
       // localize the split meta-information
       Path localSplitMeta =
         new LocalDirAllocator("mapred.local.dir").getLocalPathForWrite(

Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java?rev=1455283&r1=1455282&r2=1455283&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/Task.java Mon Mar
11 18:57:46 2013
@@ -467,6 +467,13 @@ abstract public class Task implements Wr
     conf.set("mapred.job.id", taskId.getJobID().toString());
   }
   
+  /**
+   * Write files that the IsolationRunner will need to rerun the task.
+   */
+  public void writeFilesRequiredForRerun(JobConf conf) throws IOException {
+    // Do nothing in the general case
+  }
+  
   /** Run this task as a part of the named job.  This method is executed in the
    * child process and is what invokes user-supplied map, reduce, etc. methods.
    * @param umbilical for progress reports



Mime
View raw message