hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1076973 - in /hadoop/common/branches/branch-0.20-security-patches/src: mapred/org/apache/hadoop/mapred/Task.java test/org/apache/hadoop/mapred/TestTaskCommit.java
Date Fri, 04 Mar 2011 03:27:11 GMT
Author: omalley
Date: Fri Mar  4 03:27:11 2011
New Revision: 1076973

URL: http://svn.apache.org/viewvc?rev=1076973&view=rev
Log:
commit 48476ea59216e92d7b398c6af701f473b94ccb50
Author: Yahoo\! <ltucker@yahoo-inc.com>
Date:   Mon Aug 17 14:10:57 2009 -0700

    Revert "Applying patch 2950012.mr838.patch"
    
    This reverts commit 1e58f90ccda7bb7c9c0aff9e3fd58497c94600ff.
    
    Conflicts:
    
    	YAHOO-CHANGES.txt
    	build.xml

Removed:
    hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/mapred/TestTaskCommit.java
Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java?rev=1076973&r1=1076972&r2=1076973&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java
(original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/Task.java
Fri Mar  4 03:27:11 2011
@@ -781,30 +781,27 @@ abstract public class Task implements Wr
           }
           reporter.setProgressFlag();
         }
-        break;
+        // task can Commit now  
+        try {
+          LOG.info("Task " + taskId + " is allowed to commit now");
+          committer.commitTask(taskContext);
+          return;
+        } catch (IOException iee) {
+          LOG.warn("Failure committing: " + 
+                    StringUtils.stringifyException(iee));
+          discardOutput(taskContext);
+          throw iee;
+        }
       } catch (IOException ie) {
         LOG.warn("Failure asking whether task can commit: " + 
             StringUtils.stringifyException(ie));
         if (--retries == 0) {
-          //if it couldn't query successfully then delete the output
+          //if it couldn't commit a successfully then delete the output
           discardOutput(taskContext);
           System.exit(68);
         }
       }
     }
-    
-    // task can Commit now  
-    try {
-      LOG.info("Task " + taskId + " is allowed to commit now");
-      committer.commitTask(taskContext);
-      return;
-    } catch (IOException iee) {
-      LOG.warn("Failure committing: " + 
-        StringUtils.stringifyException(iee));
-      //if it couldn't commit a successfully then delete the output
-      discardOutput(taskContext);
-      throw iee;
-    }
   }
 
   private 



Mime
View raw message