hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r956780 - in /hadoop/mapreduce/branches/branch-0.21: CHANGES.txt src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java src/tools/org/apache/hadoop/tools/DistCp.java
Date Tue, 22 Jun 2010 06:07:41 GMT
Author: tomwhite
Date: Tue Jun 22 06:07:40 2010
New Revision: 956780

URL: http://svn.apache.org/viewvc?rev=956780&view=rev
Log:
Merge -r 956778:956779 from trunk to branch-0.21. Fixes: MAPREDUCE-1885.

Modified:
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
    hadoop/mapreduce/branches/branch-0.21/src/tools/org/apache/hadoop/tools/DistCp.java

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=956780&r1=956779&r2=956780&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Tue Jun 22 06:07:40 2010
@@ -1475,3 +1475,7 @@ Release 0.21.0 - Unreleased
     (Corinne Chandel via amareshwari)
 
     MAPREDUCE-1880. Fix BigDecimal.divide(..) in the pi example.  (szetszwo)
+
+    MAPREDUCE-1885. Revert FileSystem create method that takes CreateFlags
+    (MapReduce part of HADOOP-6826). (Ravi Gummadi via tomwhite)
+

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java?rev=956780&r1=956779&r2=956780&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
Tue Jun 22 06:07:40 2010
@@ -276,8 +276,7 @@ public class JobHistory {
   
     FSDataOutputStream out = logDirFs.create(logFile, 
         new FsPermission(JobHistory.HISTORY_FILE_PERMISSION),
-        EnumSet.of(CreateFlag.OVERWRITE), 
-        defaultBufferSize, 
+        true, defaultBufferSize, 
         logDirFs.getDefaultReplication(), 
         jobHistoryBlockSize, null);
   
@@ -296,8 +295,7 @@ public class JobHistory {
         if (!logDirFs.exists(logDirConfPath)) {
           jobFileOut = logDirFs.create(logDirConfPath,
               new FsPermission(JobHistory.HISTORY_FILE_PERMISSION),
-              EnumSet.of(CreateFlag.OVERWRITE),
-              defaultBufferSize,
+              true, defaultBufferSize,
               logDirFs.getDefaultReplication(),
               logDirFs.getDefaultBlockSize(), null);
           jobConf.writeXml(jobFileOut);

Modified: hadoop/mapreduce/branches/branch-0.21/src/tools/org/apache/hadoop/tools/DistCp.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/tools/org/apache/hadoop/tools/DistCp.java?rev=956780&r1=956779&r2=956780&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/tools/org/apache/hadoop/tools/DistCp.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/tools/org/apache/hadoop/tools/DistCp.java Tue
Jun 22 06:07:40 2010
@@ -382,7 +382,7 @@ public class DistCp implements Tool {
           srcstat.getReplication(): destFileSys.getDefaultReplication();
       long blockSize = preseved.contains(FileAttribute.BLOCK_SIZE)?
           srcstat.getBlockSize(): destFileSys.getDefaultBlockSize();
-      return destFileSys.create(f, permission, EnumSet.of(CreateFlag.OVERWRITE), sizeBuf,
replication,
+      return destFileSys.create(f, permission, true, sizeBuf, replication,
           blockSize, reporter);
     }
 



Mime
View raw message