Author: ddas
Date: Mon Jun 16 22:15:12 2008
New Revision: 668397

URL: http://svn.apache.org/viewvc?rev=668397&view=rev
Log:
Merge -r 668395:668396 from trunk onto 0.18 branch. Fixes HADOOP-3560.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=668397&r1=668396&r2=668397&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Mon Jun 16 22:15:12 2008
@@ -587,6 +587,9 @@
 
     HADOOP-3363. Fix unformatted storage detection in FSImage. (shv)
 
+    HADOOP-3560. Fixes a problem to do with split creation in archives.
+    (Mahadev Konar via ddas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=668397&r1=668396&r2=668397&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
 (original)
+++ 
hadoop/core/branches/branch-0.18/src/tools/org/apache/hadoop/tools/HadoopArchives.java
 Mon Jun 16 22:15:12 2008
@@ -328,6 +328,7 @@
     try {
       // write the top level dirs in first 
       writeTopLevelDirs(srcWriter, srcPaths);
+      srcWriter.sync();
       // these are the input paths passed 
       // from the command line
       // we do a recursive ls on these paths 
@@ -356,6 +357,7 @@
           }
           srcWriter.append(new LongWritable(len), new 
               Text(toWrite));
+          srcWriter.sync();
           numFiles++;
           totalSize += len;
         }


Reply via email to