commit c54a1ef9f84d2e3565718f47d0d00f3affc1e623

Author: Jitendra Nath Pandey <jitendra@sufferhome-lm.(none)>
Date:   Tue Oct 26 16:59:04 2010 -0700

     from


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1079108 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -38,12 +38,15 @@ Trunk (unreleased changes)
     HADOOP-6996. Allow CodecFactory to return a codec object given a codec'
     class name. (hairong)
 
-    HADOOP-7171. Support Ugi in the FileContext. (jitendra)
+    HADOOP-7171. Support UGI in the FileContext. (jitendra)
+
+    HADOOP-6854. Options.createOpts should provide API to access Progress.
+    (Krishna Ramachandran via jitendra)
 
   IMPROVEMENTS
 
     HADOOP-6644. util.Shell getGROUPS_FOR_USER_COMMAND method name 
-    - should use common naming convention (boryas)
+    should use common naming convention (boryas)
 
     HADOOP-6778. add isRunning() method to 
     AbstractDelegationTokenSecretManager (for HDFS-1044) (boryas)

src/java/org/apache/hadoop/fs/Options.java

@@ -55,7 +55,11 @@ public final class Options {
     public static CreateParent donotCreateParent() {
       return new CreateParent(false);
     }
-    
+
+    public static Progress progress(Progressable progress) {
+      return new Progress(progress);
+    }
+
     public static class BlockSize extends CreateOpts {
       private final long blockSize;
       protected BlockSize(long bs) {

src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java

@@ -30,6 +30,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.apache.hadoop.util.Progressable;
 
 import static org.apache.hadoop.fs.FileContextTestHelper.*;
 
@@ -71,6 +72,10 @@ public abstract class FileContextMainOperationsBaseTest  {
     }
   };
 
+  static class TestProgress implements Progressable {
+    public void progress() { }
+  }
+
   //A test filter with returns any path containing a "b" 
   final private static PathFilter TEST_X_FILTER = new PathFilter() {
     public boolean accept(Path file) {
@@ -1052,8 +1057,10 @@ public abstract class FileContextMainOperationsBaseTest  {
     //HADOOP-4760 according to Closeable#close() closing already-closed 
     //streams should have no effect. 
     Path src = getTestRootPath(fc, "test/hadoop/file");
+    Progressable prog = new TestProgress();
     FSDataOutputStream out = fc.create(src, EnumSet.of(CreateFlag.CREATE),
-            Options.CreateOpts.createParent());
+            Options.CreateOpts.createParent(),
+            Options.CreateOpts.Progress.progress(prog));
     
     out.writeChar('H'); //write some data
     out.close();