conf.xml example + added test for buffering of Fuse stream

Author: jayunit100

conf/core-site.xml

@@ -35,4 +35,8 @@
     <value>Off</value>
   </property>
 
+  <property>
+  <name>fs.glusterfs.write.buffer.size</name>
+  <value>1024</value>
+  </property>
 </configuration>

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFUSEOutputStream.java

@@ -26,19 +26,24 @@ public class GlusterFUSEOutputStream extends OutputStream{
     long pos;
     boolean closed;
     OutputStream fuseOutputStream;
-
+    org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(GlusterFUSEOutputStream.class);
+  
     public GlusterFUSEOutputStream(String file, boolean append) throws IOException{
         this(file,append,0);
     }
 
+    /**
+     * @param bufferSize : Size of buffer in bytes (if 0, then no buffer will be used).
+     */
     public GlusterFUSEOutputStream(String file, boolean append, int bufferSize) throws IOException{
         this.f=new File(file); /* not needed ? */
         this.pos=0;
-        this.fuseOutputStream=(bufferSize==0) ? new FileOutputStream(file, append) : new BufferedOutputStream(new FileOutputStream(file, append), bufferSize);
+        fuseOutputStream=new FileOutputStream(file, append) ;
+        if(bufferSize > 0)
+        	fuseOutputStream = new BufferedOutputStream(fuseOutputStream, bufferSize);
         this.closed=false;
     }
 
-    
     public long getPos() throws IOException{
         return pos;
     }

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java

@@ -126,6 +126,7 @@ public void initialize(URI uri,Configuration conf) throws IOException{
             needQuickRead=conf.get("quick.slave.io", null);
             autoMount=conf.getBoolean("fs.glusterfs.automount", true);
             writeBufferSize = conf.getInt("fs.glusterfs.write.buffer.size", 0);
+            LOG.info("Gluster Output Buffering size configured to " + writeBufferSize + " bytes.");
             /*
              * bail out if we do not have enough information to do a FUSE mount
              */

src/test/java/org/gluster/test/TestGlusterFuseOutputStream.java

@@ -0,0 +1,34 @@
+package org.gluster.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.TreeMap;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.fs.glusterfs.GlusterFSBrickClass;
+import org.apache.hadoop.fs.glusterfs.GlusterFUSEInputStream;
+import org.apache.hadoop.fs.glusterfs.GlusterFUSEOutputStream;
+import org.junit.Test;
+
+public class TestGlusterFuseOutputStream {
+
+	@Test
+    public void testOutputStream() throws IOException{
+      File out = new File("/tmp/testGlusterFuseOutputStream");
+      
+      //Create a 3 byte FuseOutputStream
+      final GlusterFUSEOutputStream stream = new GlusterFUSEOutputStream(out.getAbsolutePath(), true, 3);
+      
+      stream.write("ab".getBytes());
+      
+      long sizeBeforeFlush = out.length();
+      
+      stream.flush();
+      stream.close();
+      
+      //Confirm that the buffer held 100 bytes.
+      Assert.assertTrue(out.length() > sizeBeforeFlush);
+      out.delete();
+    }
+}