You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ol...@apache.org on 2008/05/29 20:03:41 UTC

svn commit: r661425 - in /incubator/pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/MapReduceLauncher.java src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigOutputFormat.java

Author: olga
Date: Thu May 29 11:03:40 2008
New Revision: 661425

URL: http://svn.apache.org/viewvc?rev=661425&view=rev
Log:
PIG-250: re-enabled speculative execution and made it work

Modified:
    incubator/pig/trunk/CHANGES.txt
    incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/MapReduceLauncher.java
    incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigOutputFormat.java

Modified: incubator/pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=661425&r1=661424&r2=661425&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Thu May 29 11:03:40 2008
@@ -301,3 +301,6 @@
     PIG-85: allowing control characters as delimiters for PigStorage
 
     PIG-250: disabling speculative execution
+
+    PIG-250: re-enabling speculative execution and fixing the failure
+

Modified: incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/MapReduceLauncher.java
URL: http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/MapReduceLauncher.java?rev=661425&r1=661424&r2=661425&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/MapReduceLauncher.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/MapReduceLauncher.java Thu May 29 11:03:40 2008
@@ -236,12 +236,6 @@
                         new Path(jobOutputFile, LOG_DIR).toString());
             }
 
-            // Speculative execution is broken with hadoop 17
-            // See https://issues.apache.org/jira/browse/PIG-250
-            // till it is resolved, disabling it
-            conf.setMapSpeculativeExecution(false);
-            conf.setReduceSpeculativeExecution(false);
-            
             //
             // Now, actually submit the job (using the submit name)
             //

Modified: incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigOutputFormat.java?rev=661425&r1=661424&r2=661425&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigOutputFormat.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapreduceExec/PigOutputFormat.java Thu May 29 11:03:40 2008
@@ -45,7 +45,7 @@
 
     public RecordWriter getRecordWriter(FileSystem fs, JobConf job, String name, Progressable progress)
     throws IOException {
-        Path outputDir = FileOutputFormat.getOutputPath(job);
+        Path outputDir = FileOutputFormat.getWorkOutputPath(job);
         return getRecordWriter(fs, job, outputDir, name, progress);
     }