Merge branch 'master' into BZ927278

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>

pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.apache.hadoop.fs.glusterfs</groupId>
   <artifactId>glusterfs</artifactId>
   <packaging>jar</packaging>
-  <version>0.20.2-0.1</version>
+  <version>0.0.1-${maven.build.timestamp}</version>
   <name>glusterfs</name>
   <url>http://maven.apache.org</url>
   <dependencies>
@@ -18,6 +18,17 @@
       <artifactId>hadoop-core</artifactId>
       <version>0.20.2</version>
     </dependency>
+    <dependency>
+	    <groupId>org.slf4j</groupId>
+	    <artifactId>slf4j-api</artifactId>
+	    <version>1.5.8</version>
+    	<scope>compile</scope>
+	</dependency>
+	<dependency>	
+		<groupId>org.slf4j</groupId>
+		<artifactId>slf4j-log4j12</artifactId>
+		<version>1.7.3</version>
+	</dependency>
   </dependencies>
   <build>
     <plugins>

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

@@ -20,23 +20,31 @@
 package org.apache.hadoop.fs.glusterfs;
 
 import java.io.*;
-
-import org.apache.hadoop.fs.FSOutputSummer;
-import org.apache.hadoop.fs.FileSystem;
-
+/**
+ * An OutputStream for writing to a FUSE mount intended for use with gluster. 
+ */
 public class GlusterFUSEOutputStream extends OutputStream{
     File f;
     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=new FileOutputStream(file, append);
+        fuseOutputStream=new FileOutputStream(file, append) ;
+        if(bufferSize > 0)
+        	fuseOutputStream = new BufferedOutputStream(fuseOutputStream, bufferSize);
         this.closed=false;
     }
-
     public long getPos() throws IOException{
         return pos;
     }